From 6e6a5d7836f99547fe26f5169b358d200756c6a1 Mon Sep 17 00:00:00 2001 From: Kane York Date: Mon, 13 Nov 2017 13:40:35 -0800 Subject: [PATCH] Revert "send const ping payload" This reverts commit 26cddf5271cf618680e04f9cad3ebde1b9c9d4be. --- socketserver/server/handlecore.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index a1383a91..3afab285 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -495,8 +495,6 @@ func runSocketReader(conn *websocket.Conn, client *ClientInfo, errorChan chan<- // exit goroutine } -var pingPayload = []byte("PING") - func runSocketWriter(conn *websocket.Conn, client *ClientInfo, errorChan <-chan error, clientChan <-chan ClientMessage, serverMessageChan <-chan ClientMessage) websocket.CloseError { lastPacket := time.Now() @@ -526,7 +524,7 @@ func runSocketWriter(conn *websocket.Conn, client *ClientInfo, errorChan <-chan } conn.WriteControl( websocket.PingMessage, - pingPayload, + []byte(strconv.FormatInt(time.Now().Unix(), 10)), getDeadline(), ) continue @@ -539,7 +537,7 @@ func runSocketWriter(conn *websocket.Conn, client *ClientInfo, errorChan <-chan if msg.Command == "__ping" { // generated for PONG packets - // want to branch AFTER lastPacket is set + // want this to run AFTER lastPacket was set continue }