GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-29 07:29:31 +01:00
Code Issues Projects Releases Wiki Activity

ensure the nick timeout mechanism is cleaned up on client quit

Browse Source
This commit is contained in:
Shivaram Lingamneni 2018-02-28 00:14:44 -05:00
parent a5897baa2b
commit 945dec9964
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
irc/client.go
View File

@ -686,9 +686,8 @@ func (client *Client) destroy(beingResumed bool) {
} }
// clean up self // clean up self
if client.idletimer != nil {
client.idletimer.Stop() client.idletimer.Stop()
} client.nickTimer.Stop()
client.server.accounts.Logout(client) client.server.accounts.Logout(client)

18
irc/idletimer.go
View File

@ -127,6 +127,10 @@ func (it *IdleTimer) processTimeout() {
// Stop stops counting idle time. // Stop stops counting idle time.
func (it *IdleTimer) Stop() { func (it *IdleTimer) Stop() {
if it == nil {
return
}
it.Lock() it.Lock()
defer it.Unlock() defer it.Unlock()
it.state = TimerDead it.state = TimerDead
@ -232,6 +236,20 @@ func (nt *NickTimer) Touch() {
} }
} }
// Stop stops counting time and cleans up the timer
func (nt *NickTimer) Stop() {
if nt == nil {
return
}
nt.Lock()
defer nt.Unlock()
if nt.timer != nil {
nt.timer.Stop()
nt.timer = nil
}
}
func (nt *NickTimer) sendWarning() { func (nt *NickTimer) sendWarning() {
baseNotice := "Nickname is reserved; you must change it or authenticate to NickServ within %v" baseNotice := "Nickname is reserved; you must change it or authenticate to NickServ within %v"
nt.client.Notice(fmt.Sprintf(nt.client.t(baseNotice), nt.timeout)) nt.client.Notice(fmt.Sprintf(nt.client.t(baseNotice), nt.timeout))