From 59ba6d52f6f2a9480c7c4a81e74189d1e5312859 Mon Sep 17 00:00:00 2001 From: Kane York Date: Wed, 28 Oct 2015 15:49:53 -0700 Subject: [PATCH] fix marshalling emote usage, log non-hello first messages --- socketserver/internal/server/commands.go | 7 ++++++- socketserver/internal/server/handlecore.go | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/socketserver/internal/server/commands.go b/socketserver/internal/server/commands.go index c0d3a9e3..c0f2e8b7 100644 --- a/socketserver/internal/server/commands.go +++ b/socketserver/internal/server/commands.go @@ -287,7 +287,12 @@ func DoSendAggregateData() { reportForm.Set("follows", string(followJson)) } - emoteJson, err := json.Marshal(emoteUsage) + strEmoteUsage := make(map[string]map[string]int) + for emoteId, usageByChannel := range emoteUsage { + strEmoteId := strconv.Itoa(emoteId) + strEmoteUsage[strEmoteId] = usageByChannel + } + emoteJson, err := json.Marshal(strEmoteUsage) if err != nil { log.Print(err) } else { diff --git a/socketserver/internal/server/handlecore.go b/socketserver/internal/server/handlecore.go index a285770b..28b10b7d 100644 --- a/socketserver/internal/server/handlecore.go +++ b/socketserver/internal/server/handlecore.go @@ -199,6 +199,7 @@ RunLoop: case msg := <-clientChan: if client.Version == "" && msg.Command != HelloCommand { + log.Println("error - first message wasn't hello from", conn.RemoteAddr(), "-", msg) CloseConnection(conn, &websocket.CloseError{ Text: "Error - the first message sent must be a 'hello'", Code: websocket.ClosePolicyViolation,