From e909f4f99493fe7d72a0347d2736b5bd49cfa151 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 13 Oct 2024 17:12:06 +0300 Subject: [PATCH] websocket: fix logging commands with no data --- websocket.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/websocket.go b/websocket.go index 089d577..92886cf 100644 --- a/websocket.go +++ b/websocket.go @@ -51,6 +51,8 @@ const ( StatusPingTimeout = 4002 ) +var emptyObject = json.RawMessage("{}") + func (gmx *Gomuks) HandleWebsocket(w http.ResponseWriter, r *http.Request) { if r.Header.Get("Sec-Fetch-Mode") != "websocket" { ErrInvalidHeader.WithMessage("Invalid Sec-Fetch-Dest header").Write(w) @@ -156,6 +158,9 @@ func (gmx *Gomuks) HandleWebsocket(w http.ResponseWriter, r *http.Request) { closeOnce.Do(forceClose) } }() + if cmd.Data == nil { + cmd.Data = emptyObject + } log.Trace(). Int64("req_id", cmd.RequestID). Str("command", cmd.Command).