From 5d3b185881988bf7ca4fd39395d6b0c4a9d791c8 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Thu, 30 Jun 2016 15:35:34 +1000 Subject: [PATCH] client: Use more accurate QUIT message for ping timeouts --- irc/client.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/irc/client.go b/irc/client.go index 7a992fb6..78d16071 100644 --- a/irc/client.go +++ b/irc/client.go @@ -8,14 +8,19 @@ package irc import ( "fmt" "net" + "strconv" "time" "github.com/DanielOaks/girc-go/ircmsg" ) const ( - IDLE_TIMEOUT = time.Minute // how long before a client is considered idle - QUIT_TIMEOUT = time.Minute // how long after idle before a client is kicked + IDLE_TIMEOUT = time.Minute + time.Second*30 // how long before a client is considered idle + QUIT_TIMEOUT = time.Minute // how long after idle before a client is kicked +) + +var ( + TIMEOUT_STATED_SECONDS = strconv.Itoa(int((IDLE_TIMEOUT + QUIT_TIMEOUT).Seconds())) ) type Client struct { @@ -117,7 +122,7 @@ func (client *Client) run() { // func (client *Client) connectionTimeout() { - client.Quit("connection timeout") + client.Quit(fmt.Sprintf("Ping timeout: %s seconds", TIMEOUT_STATED_SECONDS)) client.isQuitting = true }