From ab14cdac725445c81647a2041e0fca8feef4c786 Mon Sep 17 00:00:00 2001 From: Kane York Date: Mon, 16 Nov 2015 20:26:59 -0800 Subject: [PATCH] Fix disconnect reason statistics --- socketserver/server/handlecore.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index 4157a8fa..2a901f86 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -316,7 +316,13 @@ func getDeadline() time.Time { func CloseConnection(conn *websocket.Conn, closeMsg *websocket.CloseError) { Statistics.DisconnectCodes[strconv.Itoa(closeMsg.Code)]++ - Statistics.DisconnectReasons[closeMsg.Text]++ + closeTxt := closeMsg.Text + if strings.Contains(closeTxt, "read: connection reset by peer") { + closeTxt = "read: connection reset by peer" + } else if closeMsg.Code == 1001 { + closeTxt = "clean shutdown" + } + Statistics.DisconnectReasons[closeTxt]++ conn.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(closeMsg.Code, closeMsg.Text), getDeadline()) conn.Close()