From 32d88786489ac90919f29a84b4c8065810b9a9d2 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Wed, 25 Jan 2017 16:23:14 +0000
Subject: [PATCH] Add back silencing of go-rpc output for client pending fix
---
client/node_client.go | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/client/node_client.go b/client/node_client.go
index 302bb968..4502d77c 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
}
--
GitLab