From b071e7f4db0e3cf7ee78082af3d0b46617b6e5ed Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 27 Apr 2015 09:18:55 -0500 Subject: [PATCH] Remove old logger from RPC pkg --- rpc/api.go | 2 +- rpc/http.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rpc/api.go b/rpc/api.go index 085d8cf27..cbf03ed86 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -489,6 +489,6 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err return NewNotImplementedError(req.Method) } - rpclogger.DebugDetailf("Reply: %T %s", reply, reply) + glog.V(logger.Detail).Infof("Reply: %T %s\n", reply, reply) return nil } diff --git a/rpc/http.go b/rpc/http.go index f9c646908..4760601d8 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -13,7 +13,6 @@ import ( "github.com/rs/cors" ) -var rpclogger = logger.NewLogger("RPC") var rpclistener *stoppableTCPListener const ( @@ -31,7 +30,7 @@ func Start(pipe *xeth.XEth, config RpcConfig) error { l, err := newStoppableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort)) if err != nil { - rpclogger.Errorf("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err) + glog.V(logger.Error).Infof("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err) return err } rpclistener = l @@ -136,7 +135,7 @@ func send(writer io.Writer, v interface{}) (n int, err error) { var payload []byte payload, err = json.MarshalIndent(v, "", "\t") if err != nil { - rpclogger.Fatalln("Error marshalling JSON", err) + glog.V(logger.Error).Infoln("Error marshalling JSON", err) return 0, err } glog.V(logger.Detail).Infof("Sending payload: %s", payload)