From 7576d8c1daaac60044634fda85dc07659b4dd11b Mon Sep 17 00:00:00 2001
From: Craig <craigbett@gmail.com>
Date: Thu, 13 Feb 2020 04:45:29 +0000
Subject: [PATCH] log ws send/recieve

---
 server/internal/websocket/socket.go    | 15 ++++++++++++++-
 server/internal/websocket/websocket.go |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/internal/websocket/socket.go b/server/internal/websocket/socket.go
index 7a2c6b7b..2439cd21 100644
--- a/server/internal/websocket/socket.go
+++ b/server/internal/websocket/socket.go
@@ -1,6 +1,7 @@
 package websocket
 
 import (
+	"encoding/json"
 	"strings"
 	"sync"
 
@@ -9,6 +10,7 @@ import (
 
 type WebSocket struct {
 	id         string
+	ws         WebSocketHandler
 	connection *websocket.Conn
 	mu         sync.Mutex
 }
@@ -29,7 +31,18 @@ func (socket *WebSocket) Send(v interface{}) error {
 		return nil
 	}
 
-	return socket.connection.WriteJSON(v)
+	raw, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	socket.ws.logger.Debug().
+		Str("session", socket.id).
+		Str("address", socket.connection.RemoteAddr().String()).
+		Str("raw", string(raw)).
+		Msg("sending message to client")
+
+	return socket.connection.WriteMessage(websocket.TextMessage, raw)
 }
 
 func (socket *WebSocket) Destroy() error {
diff --git a/server/internal/websocket/websocket.go b/server/internal/websocket/websocket.go
index f3da856b..57cf34e9 100644
--- a/server/internal/websocket/websocket.go
+++ b/server/internal/websocket/websocket.go
@@ -240,6 +240,7 @@ func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) {
 		case raw := <-bytes:
 			ws.logger.Debug().
 				Str("session", id).
+				Str("address", connection.RemoteAddr().String()).
 				Str("raw", string(raw)).
 				Msg("recieved message from client")
 			if err := ws.handler.Message(id, raw); err != nil {