websocket: update log related format

Use "fmt" package when printing debugging information, and "log" package
when printing error.

2 files changed, 26 insertions, 16 deletions

diff --git a/lib/websocket/client.go b/lib/websocket/client.go
index 12c24966..6a354ec1 100644
--- a/lib/websocket/client.go
+++ b/lib/websocket/client.go
@@ -263,6 +263,10 @@ func (cl *Client) open() (err error) {
 		Timeout: 30 * time.Second,
 	}
 
+	if debug.Value >= 3 {
+		fmt.Printf("websocket: Client.open: remoteAddr: %s\n", cl.remoteAddr)
+	}
+
 	if cl.isTLS {
 		cfg := &tls.Config{
 			InsecureSkipVerify: cl.isTLS, //nolint:gas
@@ -341,7 +345,7 @@ func (cl *Client) handleBadRequest() {
 
 	err := cl.send(frameClose)
 	if err != nil {
-		log.Println("websocket: server.handleBadRequest: " + err.Error())
+		log.Println("websocket: Client.handleBadRequest: " + err.Error())
 	}
 }
 
@@ -395,12 +399,12 @@ func clientOnClose(cl *Client, frame *Frame) error {
 	packet := NewFrameClose(true, frame.closeCode, frame.payload)
 
 	if debug.Value >= 3 {
-		log.Printf("websocket: Client.onClose: %+v\n", frame)
+		fmt.Printf("websocket: clientOnClose: payload: %s\n", frame.payload)
 	}
 
 	err := cl.send(packet)
 	if err != nil {
-		log.Println("websocket: Client.onClose: Send: " + err.Error())
+		log.Println("websocket: clientOnClose: send: " + err.Error())
 	}
 
 	cl.Quit()
@@ -413,7 +417,7 @@ func clientOnClose(cl *Client, frame *Frame) error {
 //
 func (cl *Client) handleFragment(frame *Frame) (isInvalid bool) {
 	if debug.Value >= 3 {
-		log.Printf("websocket: Client.handleFragment: frame: {fin:%d opcode:%d masked:%d len:%d, payload.len:%d}\n",
+		fmt.Printf("websocket: Client.handleFragment: frame:{fin:%d opcode:%d masked:%d len:%d, payload.len:%d}\n",
 			frame.fin, frame.opcode, frame.masked, frame.len,
 			len(frame.payload))
 	}
@@ -486,10 +490,6 @@ func (cl *Client) handleFrame(frame *Frame) (isClosing bool) {
 		return true
 	}
 
-	if debug.Value >= 3 {
-		log.Printf("websocket: Client.handleFrame: %+v\n", frame)
-	}
-
 	switch frame.opcode {
 	case OpcodeCont, OpcodeText, OpcodeBin:
 		isInvalid := cl.handleFragment(frame)
@@ -528,11 +528,11 @@ func (cl *Client) handleHandshake(keyAccept string, resp []byte) (err error) {
 		}
 		fmt.Printf("websocket: Client.handleHandshake:\n%s\n--\n", resp[:max])
 	}
+
 	httpBuf := bufio.NewReader(bytes.NewBuffer(resp))
 
 	httpRes, err := http.ReadResponse(httpBuf, nil)
 	if err != nil {
-		fmt.Printf("websocket: Client.handleHandshake: http.ReadResponse")
 		return err
 	}
 
@@ -630,7 +630,11 @@ func (cl *Client) serve() {
 		}
 
 		if debug.Value >= 3 {
-			log.Printf("websocket: Client.serve: packet: % x\n", packet)
+			max := len(packet)
+			if max > 16 {
+				max = 16
+			}
+			fmt.Printf("websocket: Client.serve: packet: len:%d % x\n", len(packet), packet[:max])
 		}
 
 		if cl.frame != nil {
@@ -721,6 +725,7 @@ func (cl *Client) recv() (packet []byte, err error) {
 		if err != nil || n == 0 {
 			break
 		}
+
 		packet = append(packet, buf[:n]...)
 		if n < len(buf) {
 			break
@@ -741,7 +746,11 @@ func (cl *Client) send(packet []byte) (err error) {
 	}
 
 	if debug.Value >= 3 {
-		log.Printf("websocket: Client.send: % x\n", packet)
+		max := len(packet)
+		if max > 16 {
+			max = 16
+		}
+		fmt.Printf("websocket: Client.send: % x\n", packet[:max])
 	}
 
 	_, err = cl.conn.Write(packet)
diff --git a/lib/websocket/server.go b/lib/websocket/server.go
index 2bed8ae9..f4c240f7 100644
--- a/lib/websocket/server.go
+++ b/lib/websocket/server.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"log"
 	"net"
 	"net/http"
@@ -340,7 +341,7 @@ func (serv *Server) handleFragment(conn int, req *Frame) (isInvalid bool) {
 	frames, ok := serv.Clients.getFrames(conn)
 
 	if debug.Value >= 3 {
-		log.Printf("websocket: Server.handleFragment: frame: {fin:%d opcode:%d masked:%d len:%d, payload.len:%d}\n",
+		fmt.Printf("websocket: Server.handleFragment: frame: {fin:%d opcode:%d masked:%d len:%d, payload.len:%d}\n",
 			req.fin, req.opcode, req.masked, req.len, len(req.payload))
 	}
 
@@ -550,7 +551,7 @@ func (serv *Server) handleClose(conn int, req *Frame) {
 	packet := NewFrameClose(false, req.closeCode, req.payload)
 
 	if debug.Value >= 3 {
-		log.Printf("websocket: Server.handleClose: req: %+v\n", req)
+		fmt.Printf("websocket: Server.handleClose: req: %+v\n", req)
 	}
 
 	err := Send(conn, packet)
@@ -611,7 +612,7 @@ func (serv *Server) handleInvalidData(conn int) {
 //
 func (serv *Server) handlePing(conn int, req *Frame) {
 	if debug.Value >= 3 {
-		log.Printf("websocket: Server.handlePing: conn:%d frame:%+v\n", conn, req)
+		fmt.Printf("websocket: Server.handlePing: conn:%d frame:%+v\n", conn, req)
 	}
 
 	req.opcode = OpcodePong
@@ -661,7 +662,7 @@ func (serv *Server) reader() {
 				if max > 16 {
 					max = 16
 				}
-				log.Printf("websocket: Server.reader: packet {len:%d value:% x ...}\n", len(packet), packet[:max])
+				fmt.Printf("websocket: Server.reader: packet {len:%d value:% x ...}\n", len(packet), packet[:max])
 			}
 
 			// Handle chopped, unfinished packet or payload.
@@ -688,7 +689,7 @@ func (serv *Server) reader() {
 			}
 
 			if debug.Value >= 3 && frames != nil {
-				log.Printf("websocket: Server.reader: frames: len:%d\n", len(frames.v))
+				fmt.Printf("websocket: Server.reader: frames: len:%d\n", len(frames.v))
 			}
 
 			var isClosing bool