diff options
Diffstat (limited to 'rpc/server.go')
| -rw-r--r-- | rpc/server.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rpc/server.go b/rpc/server.go index 996c63700..4f9ce541e 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -22,8 +22,8 @@ import ( "runtime" "sync/atomic" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/log" + "golang.org/x/net/context" "gopkg.in/fatih/set.v0" ) @@ -149,7 +149,7 @@ func (s *Server) serveRequest(codec ServerCodec, singleShot bool, options CodecO const size = 64 << 10 buf := make([]byte, size) buf = buf[:runtime.Stack(buf, false)] - glog.Errorln(string(buf)) + log.Error(fmt.Sprint(string(buf))) } s.codecsMu.Lock() @@ -180,7 +180,7 @@ func (s *Server) serveRequest(codec ServerCodec, singleShot bool, options CodecO for atomic.LoadInt32(&s.run) == 1 { reqs, batch, err := s.readRequest(codec) if err != nil { - glog.V(logger.Debug).Infof("read error %v\n", err) + log.Debug(fmt.Sprintf("read error %v\n", err)) codec.Write(codec.CreateErrorResponse(nil, err)) return nil } @@ -236,7 +236,7 @@ func (s *Server) ServeSingleRequest(codec ServerCodec, options CodecOption) { // close all codecs which will cancel pending requests/subscriptions. func (s *Server) Stop() { if atomic.CompareAndSwapInt32(&s.run, 1, 0) { - glog.V(logger.Debug).Infoln("RPC Server shutdown initiatied") + log.Debug(fmt.Sprint("RPC Server shutdown initiatied")) s.codecsMu.Lock() defer s.codecsMu.Unlock() s.codecs.Each(func(c interface{}) bool { @@ -341,7 +341,7 @@ func (s *Server) exec(ctx context.Context, codec ServerCodec, req *serverRequest } if err := codec.Write(response); err != nil { - glog.V(logger.Error).Infof("%v\n", err) + log.Error(fmt.Sprintf("%v\n", err)) codec.Close() } @@ -368,7 +368,7 @@ func (s *Server) execBatch(ctx context.Context, codec ServerCodec, requests []*s } if err := codec.Write(responses); err != nil { - glog.V(logger.Error).Infof("%v\n", err) + log.Error(fmt.Sprintf("%v\n", err)) codec.Close() } |