logging has been changed

protocol/jsonrpc/jsonrpc.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"io"
 
-	"go.uber.org/zap"
-
 	"git.loafle.net/commons_go/logging"
 	ogw "git.loafle.net/overflow/overflow_gateway_websocket"
 )
@@ -17,16 +15,14 @@ type JSONRpc interface {
 }
 
 type jsonRpc struct {
-	ctx    context.Context
-	logger *zap.Logger
-	jh     JSONRpcHandler
+	ctx context.Context
+	jh  JSONRpcHandler
 }
 
 func New(ctx context.Context, jh JSONRpcHandler) JSONRpc {
 	jr := &jsonRpc{
-		ctx:    ctx,
-		logger: logging.WithContext(ctx),
-		jh:     jh,
+		ctx: ctx,
+		jh:  jh,
 	}
 
 	return jr
@@ -63,7 +59,7 @@ func (jr *jsonRpc) onRequest(soc ogw.Socket, req *ServerRequest) []byte {
 
 	j, err := json.Marshal(res)
 	if nil != err {
-		jr.logger.Error(fmt.Sprintf("JSON RPC error: %v", err))
+		logging.Logger.Error(fmt.Sprintf("JSON RPC error: %v", err))
 	}
 
 	return j
@@ -72,6 +68,6 @@ func (jr *jsonRpc) onRequest(soc ogw.Socket, req *ServerRequest) []byte {
 func (jr *jsonRpc) onNotify(soc ogw.Socket, req *ServerRequest) {
 	err := jr.jh.OnNotify(soc, req.Method, req.Params)
 	if nil != err {
-		jr.logger.Error(fmt.Sprintf("JSON RPC error: %v", err))
+		logging.Logger.Error(fmt.Sprintf("JSON RPC error: %v", err))
 	}
 }

server.go

@@ -4,9 +4,6 @@ import (
 	"context"
 	"net/http"
 
-	"go.uber.org/zap"
-
-	"git.loafle.net/commons_go/logging"
 	uch "git.loafle.net/commons_go/util/channel"
 	"git.loafle.net/overflow/overflow_gateway_websocket/websocket"
 	"github.com/valyala/fasthttp"
@@ -26,7 +23,6 @@ type Server interface {
 
 type server struct {
 	_ctx       context.Context
-	_logger    *zap.Logger
 	_sh        ServerHandler
 	_upgrader  *websocket.Upgrader
 	_handlers  map[string]SocketHandler
@@ -39,7 +35,6 @@ func NewServer(ctx context.Context, sh ServerHandler) Server {
 
 	s := &server{
 		_ctx:       ctx,
-		_logger:    logging.WithContext(ctx),
 		_sh:        sh,
 		_handlers:  make(map[string]SocketHandler, 1),
 		_sockets:   make(map[string]Socket, 100),

socket.go

@@ -2,10 +2,11 @@ package overflow_gateway_websocket
 
 import (
 	"context"
+	"fmt"
 	"io"
-	"log"
 	"time"
 
+	"git.loafle.net/commons_go/logging"
 	"git.loafle.net/overflow/overflow_gateway_websocket/websocket"
 )
 
@@ -108,12 +109,12 @@ func (soc *socket) listenWrite() {
 		case w := <-soc.writeCh:
 			if writeTimeout := soc.sh.GetWriteTimeout(); writeTimeout > 0 {
 				err := soc.conn.SetWriteDeadline(time.Now().Add(writeTimeout))
-				log.Printf("Socket timeout: %v", err)
+				logging.Logger.Info(fmt.Sprintf("Socket timeout: %v", err))
 			}
 
 			err := soc.conn.WriteMessage(soc.messageType, w)
 			if nil != err {
-				log.Printf("Socket Write error: %v", err)
+				logging.Logger.Error(fmt.Sprintf("Socket Write error: %v", err))
 			}
 
 		// receive done request