From ea4909cdc6c4256cd52e620d7308686c6994f008 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 27 Oct 2017 13:15:00 -0700 Subject: [PATCH] Reformat --- socketserver/server/handlecore.go | 6 +++--- socketserver/server/types.go | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index 882d6f76..6e572819 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -463,7 +463,7 @@ func runSocketReader(conn *websocket.Conn, client *ClientInfo, errorChan chan<- } func runSocketWriter(conn *websocket.Conn, client *ClientInfo, errorChan <-chan error, clientChan <-chan ClientMessage, serverMessageChan <-chan ClientMessage) websocket.CloseError { - pingTicker := time.NewTicker(1*time.Minute) + pingTicker := time.NewTicker(1 * time.Minute) defer pingTicker.Stop() lastPacket := time.Now() @@ -512,9 +512,9 @@ func runSocketWriter(conn *websocket.Conn, client *ClientInfo, errorChan <-chan case <-pingTicker.C: now := time.Now() - if lastPacket.Add(5*time.Minute).Before(now) { + if lastPacket.Add(5 * time.Minute).Before(now) { return CloseTimedOut - } else if lastPacket.Add(1*time.Minute).Before(now) { + } else if lastPacket.Add(1 * time.Minute).Before(now) { conn.WriteControl(websocket.PingMessage, []byte(strconv.FormatInt(time.Now().Unix(), 10)), getDeadline()) } diff --git a/socketserver/server/types.go b/socketserver/server/types.go index 24482261..b4fae2af 100644 --- a/socketserver/server/types.go +++ b/socketserver/server/types.go @@ -47,13 +47,11 @@ type ConfigFile struct { ProxyRoutes []ProxyRoute } - type ProxyRoute struct { - Route string - Server string + Route string + Server string } - type ClientMessage struct { // Message ID. Increments by 1 for each message sent from the client. // When replying to a command, the message ID must be echoed.