diff --git a/client/node_client.go b/client/node_client.go index 302bb968767c1393a8a1f578a7e970dc720c4a29..4502d77cca860fc0708f8ec14248502a515843ac 100644 --- a/client/node_client.go +++ b/client/node_client.go @@ -30,6 +30,7 @@ import ( tendermint_client "github.com/eris-ltd/eris-db/rpc/tendermint/client" tendermint_types "github.com/eris-ltd/eris-db/rpc/tendermint/core/types" "github.com/eris-ltd/eris-db/txs" + tmLog15 "github.com/tendermint/log15" ) type NodeClient interface { @@ -77,6 +78,13 @@ func NewErisNodeClient(rpcString string, logger loggers.InfoTraceLogger) *erisNo } } +// Note [Ben]: This is a hack to silence Tendermint logger from tendermint/go-rpc +// it needs to be initialised before go-rpc, hence it's placement here. +func init() { + h := tmLog15.LvlFilterHandler(tmLog15.LvlWarn, tmLog15.StdoutHandler) + tmLog15.Root().SetHandler(h) +} + //------------------------------------------------------------------------------------ // broadcast to blockchain node // NOTE: [ben] Eris Client first continues from tendermint rpc, but will have handshake to negotiate @@ -119,7 +127,7 @@ func (erisNodeClient *erisNodeClient) DeriveWebsocketClient() (nodeWsClient Node } derivedErisNodeWebsocketClient := &erisNodeWebsocketClient{ tendermintWebsocket: wsClient, - logger: logging.WithScope(erisNodeClient.logger, "ErisNodeWebsocketClient"), + logger: logging.WithScope(erisNodeClient.logger, "ErisNodeWebsocketClient"), } return derivedErisNodeWebsocketClient, nil } diff --git a/logging/adapters/adapters.go b/logging/adapters/adapters.go deleted file mode 100644 index 3b0cec85a77743071a9487b730c4d3ad4e77825c..0000000000000000000000000000000000000000 --- a/logging/adapters/adapters.go +++ /dev/null @@ -1,2 +0,0 @@ -package adapters -