Mirrors/gomuks
1
0
Fork 1
mirror of https://github.com/tulir/gomuks.git synced 2025-04-20 10:33:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

websocket: fix logging commands with no data

Browse source
This commit is contained in:
Tulir Asokan 2024-10-13 17:12:06 +03:00
parent 4eec9f5eb6
commit e909f4f994
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
websocket.go
View file

@ -51,6 +51,8 @@ const (
StatusPingTimeout = 4002 StatusPingTimeout = 4002
) )
var emptyObject = json.RawMessage("{}")
func (gmx *Gomuks) HandleWebsocket(w http.ResponseWriter, r *http.Request) { func (gmx *Gomuks) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("Sec-Fetch-Mode") != "websocket" { if r.Header.Get("Sec-Fetch-Mode") != "websocket" {
ErrInvalidHeader.WithMessage("Invalid Sec-Fetch-Dest header").Write(w) 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) closeOnce.Do(forceClose)
} }
}() }()
if cmd.Data == nil {
cmd.Data = emptyObject
}
log.Trace(). log.Trace().
Int64("req_id", cmd.RequestID). Int64("req_id", cmd.RequestID).
Str("command", cmd.Command). Str("command", cmd.Command).