certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dependency upgrade

This commit is contained in:
zhangyelong 2018-03-28 11:44:06 +08:00
parent 358f7ad8e9
commit d42a308887
4 changed files with 78 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tm-monitor/eventmeter/eventmeter.go
View File

@ -115,7 +115,7 @@ func (em *EventMeter) String() string {
// Start boots up event meter. // Start boots up event meter.
func (em *EventMeter) Start() error { func (em *EventMeter) Start() error {
if _, err := em.wsc.Start(); err != nil { if err := em.wsc.Start(); err != nil {
return err return err
} }
@ -219,7 +219,7 @@ func (em *EventMeter) receiveRoutine() {
em.logger.Error("expected some event, got error", "err", resp.Error.Error()) em.logger.Error("expected some event, got error", "err", resp.Error.Error())
continue continue
} }
eventType, data, err := em.unmarshalEvent(*resp.Result) eventType, data, err := em.unmarshalEvent(resp.Result)
if err != nil { if err != nil {
em.logger.Error("failed to unmarshal event", "err", err) em.logger.Error("failed to unmarshal event", "err", err)
continue continue
@ -231,7 +231,7 @@ func (em *EventMeter) receiveRoutine() {
if em.wsc.IsActive() { if em.wsc.IsActive() {
em.callLatencyCallback(em.wsc.PingPongLatencyTimer.Mean()) em.callLatencyCallback(em.wsc.PingPongLatencyTimer.Mean())
} }
case <-em.wsc.Quit: case <-em.wsc.Quit():
return return
case <-em.quit: case <-em.quit:
return return
@ -251,7 +251,7 @@ func (em *EventMeter) disconnectRoutine() {
em.subscribe() em.subscribe()
em.subscribed = true em.subscribed = true
} }
case <-em.wsc.Quit: case <-em.wsc.Quit():
return return
case <-em.quit: case <-em.quit:
return return

88
tm-monitor/glide.lock generated
View File

@ -1,50 +1,75 @@
hash: 156fcaac82d95af15aa920438cd12ab6ba1ac0ea5dfe8a5ca7eae94eeae625be hash: defdaf7b594915e7916df4f96d43363c2976ffcb2c35f0dd50b23ec1dd2551fb
updated: 2017-12-06T18:01:20.739645218Z updated: 2018-03-27T16:08:55.112172+08:00
imports: imports:
- name: github.com/btcsuite/btcd - name: github.com/btcsuite/btcd
version: 583684b21bfbde9b5fc4403916fd7c807feb0289 version: 2e60448ffcc6bf78332d1fe590260095f554dd78
subpackages: subpackages:
- btcec - btcec
- name: github.com/ebuchman/fail-test
version: 95f809107225be108efcf10a3509e4ea6ceef3c4
- name: github.com/go-kit/kit - name: github.com/go-kit/kit
version: b6f30a2e0632f5722fb26d8765d726335b79d3e6 version: ca4112baa34cb55091301bdc13b1420a122b1b9e
subpackages: subpackages:
- log - log
- log/level - log/level
- log/term - log/term
- name: github.com/go-logfmt/logfmt - name: github.com/go-logfmt/logfmt
version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
- name: github.com/go-playground/locales
version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6
subpackages:
- currency
- name: github.com/go-playground/universal-translator
version: 71201497bace774495daed26a3874fd339e0b538
- name: github.com/go-stack/stack - name: github.com/go-stack/stack
version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc
- name: github.com/gogo/protobuf
version: 1adfc126b41513cc696b209667c8656ea7aac67c
subpackages:
- gogoproto
- jsonpb
- proto
- protoc-gen-gogo/descriptor
- sortkeys
- types
- name: github.com/golang/protobuf - name: github.com/golang/protobuf
version: 69b215d01a5606c843240eab4937eab3acee6530 version: 925541529c1fa6821df4e44ce2723319eb2be768
subpackages: subpackages:
- proto - proto
- ptypes - ptypes
- ptypes/any - ptypes/any
- ptypes/duration - ptypes/duration
- ptypes/timestamp - ptypes/timestamp
- name: github.com/golang/snappy
version: 553a641470496b2327abcac10b36396bd98e45c9
- name: github.com/gorilla/websocket - name: github.com/gorilla/websocket
version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b
- name: github.com/jmhodges/levigo
version: c42d9e0ca023e2198120196f842701bb4c55d7b9
- name: github.com/kr/logfmt - name: github.com/kr/logfmt
version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
- name: github.com/pkg/errors - name: github.com/pkg/errors
version: 645ef00459ed84a119197bfb8d8205042c6df63d version: 645ef00459ed84a119197bfb8d8205042c6df63d
- name: github.com/rcrowley/go-metrics - name: github.com/rcrowley/go-metrics
version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c version: e181e095bae94582363434144c61a9653aff6e50
- name: github.com/syndtr/goleveldb
version: adf24ef3f94bd13ec4163060b21a5678f22b429b
subpackages:
- leveldb
- leveldb/cache
- leveldb/comparer
- leveldb/errors
- leveldb/filter
- leveldb/iterator
- leveldb/journal
- leveldb/memdb
- leveldb/opt
- leveldb/storage
- leveldb/table
- leveldb/util
- name: github.com/tendermint/abci - name: github.com/tendermint/abci
version: 76ef8a0697c6179220a74c479b36c27a5b53008a version: 68592f4d8ee34e97db94b7a7976b1309efdb7eb9
subpackages: subpackages:
- client - client
- example/code
- example/dummy - example/dummy
- types - types
- name: github.com/tendermint/ed25519 - name: github.com/tendermint/ed25519
version: 1f52c6f8b8a5c7908aff4497c186af344b428925 version: d8387025d2b9d158cf4efb07e7ebf814bcce2057
subpackages: subpackages:
- edwards25519 - edwards25519
- extra25519 - extra25519
@ -55,27 +80,33 @@ imports:
subpackages: subpackages:
- data - data
- name: github.com/tendermint/tendermint - name: github.com/tendermint/tendermint
version: c7f923c5b0d0f0f26566281aa251259d1bef3a6c version: c8a2bdf78ba7aaaf4284fa78c1b9b05c5e7342bc
subpackages: subpackages:
- config - config
- consensus/types - consensus/types
- p2p - p2p
- p2p/conn
- p2p/upnp - p2p/upnp
- proxy
- rpc/core/types - rpc/core/types
- rpc/lib/client - rpc/lib/client
- rpc/lib/server - rpc/lib/server
- rpc/lib/types - rpc/lib/types
- state
- types - types
- name: github.com/tendermint/tmlibs - name: github.com/tendermint/tmlibs
version: b854baa1fce7101c90b1d301b3359bb412f981c0 version: 1b9b5652a199ab0be2e781393fb275b66377309d
subpackages: subpackages:
- common - common
- db
- events - events
- flowrate - flowrate
- log - log
- merkle - merkle
- pubsub
- pubsub/query
- name: golang.org/x/crypto - name: golang.org/x/crypto
version: 453249f01cfeb54c3d549ddb75ff152ca243f9d8 version: 94eea52f7b742c7cbe0b03b22f0c4c8631ece122
subpackages: subpackages:
- curve25519 - curve25519
- nacl/box - nacl/box
@ -86,7 +117,7 @@ imports:
- ripemd160 - ripemd160
- salsa20/salsa - salsa20/salsa
- name: golang.org/x/net - name: golang.org/x/net
version: 906cda9512f77671ab44f8c8563b13a8e707b230 version: 5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec
subpackages: subpackages:
- context - context
- http2 - http2
@ -95,12 +126,23 @@ imports:
- internal/timeseries - internal/timeseries
- lex/httplex - lex/httplex
- trace - trace
- name: golang.org/x/text
version: 57961680700a5336d15015c8c50686ca5ba362a4
subpackages:
- secure/bidirule
- transform
- unicode/bidi
- unicode/norm
- name: google.golang.org/genproto - name: google.golang.org/genproto
version: 7f0da29060c682909f650ad8ed4e515bd74fa12a version: a8101f21cf983e773d0c1133ebc5424792003214
repo: https://github.com/google/go-genproto
vcs: git
subpackages: subpackages:
- googleapis/rpc/status - googleapis/rpc/status
- name: google.golang.org/grpc - name: google.golang.org/grpc
version: f7bf885db0b7479a537ec317c6e48ce53145f3db version: 401e0e00e4bb830a10496d64cd95e068c5bf50de
repo: https://github.com/grpc/grpc-go
vcs: git
subpackages: subpackages:
- balancer - balancer
- codes - codes
@ -118,8 +160,6 @@ imports:
- status - status
- tap - tap
- transport - transport
- name: gopkg.in/go-playground/validator.v9
version: 61caf9d3038e1af346dbf5c2e16f6678e1548364
testImports: testImports:
- name: github.com/davecgh/go-spew - name: github.com/davecgh/go-spew
version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9 version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
@ -130,7 +170,7 @@ testImports:
subpackages: subpackages:
- difflib - difflib
- name: github.com/stretchr/testify - name: github.com/stretchr/testify
version: 4d4bfba8f1d1027c4fdbe371823030df51419987 version: 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f
subpackages: subpackages:
- assert - assert
- require - require

15
tm-monitor/glide.yaml
View File

@ -5,18 +5,19 @@ import:
- package: github.com/rcrowley/go-metrics - package: github.com/rcrowley/go-metrics
- package: github.com/tendermint/go-crypto - package: github.com/tendermint/go-crypto
- package: github.com/tendermint/tendermint - package: github.com/tendermint/tendermint
version: v0.12.1 version: v0.16.0
subpackages:
- rpc/core/types
- rpc/lib/client
- rpc/lib/server
- types
- package: github.com/tendermint/tmlibs - package: github.com/tendermint/tmlibs
version: v0.4.1 version: v0.7.0
subpackages: subpackages:
- common - common
- events - events
- log - log
- package: google.golang.org/grpc
repo: https://github.com/grpc/grpc-go
vcs: git
- package: google.golang.org/genproto
repo: https://github.com/google/go-genproto
vcs: git
testImport: testImport:
- package: github.com/stretchr/testify - package: github.com/stretchr/testify
subpackages: subpackages:

4
tm-monitor/monitor/node.go
View File

@ -101,7 +101,7 @@ func (n *Node) Start() error {
} }
n.em.RegisterLatencyCallback(latencyCallback(n)) n.em.RegisterLatencyCallback(latencyCallback(n))
err := n.em.Subscribe(tmtypes.EventStringNewBlockHeader(), newBlockCallback(n)) err := n.em.Subscribe(tmtypes.EventQueryNewBlockHeader.String(), newBlockCallback(n))
if err != nil { if err != nil {
return err return err
} }
@ -254,5 +254,5 @@ func UnmarshalEvent(b json.RawMessage) (string, events.EventData, error) {
if err := json.Unmarshal(b, event); err != nil { if err := json.Unmarshal(b, event); err != nil {
return "", nil, err return "", nil, err
} }
return event.Name, event.Data, nil return event.Query, event.Data, nil
} }