GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix always-on expiration checks 

checkAlwaysOnExpirationNoMutex was respecting registered status, but
always-on clients were not considered registered at the time of the
initial check, so they were being created regardless of expiration.
This commit is contained in:
Shivaram Lingamneni 2021-01-15 06:50:35 -05:00
parent 7b300a802f
commit 6b7f0e15ac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/client.go
View File

@ -443,7 +443,7 @@ func (server *Server) AddAlwaysOnClient(account ClientAccount, channelToModes ma
nextSessionID: 1, nextSessionID: 1,
} }
if client.checkAlwaysOnExpirationNoMutex(config) { if client.checkAlwaysOnExpirationNoMutex(config, true) {
server.logger.Debug("accounts", "always-on client not created due to expiration", account.Name) server.logger.Debug("accounts", "always-on client not created due to expiration", account.Name)
return return
} }
@ -1403,7 +1403,7 @@ func (client *Client) destroy(session *Session) {
alwaysOn := registered && client.alwaysOn alwaysOn := registered && client.alwaysOn
// if we hit always-on-expiration, confirm the expiration and then proceed as though // if we hit always-on-expiration, confirm the expiration and then proceed as though
// always-on is disabled: // always-on is disabled:
if alwaysOn && session == nil && client.checkAlwaysOnExpirationNoMutex(config) { if alwaysOn && session == nil && client.checkAlwaysOnExpirationNoMutex(config, false) {
quitMessage = "Timed out due to inactivity" quitMessage = "Timed out due to inactivity"
alwaysOn = false alwaysOn = false
client.alwaysOn = false client.alwaysOn = false

6
irc/getters.go
View File

@ -452,11 +452,11 @@ func (client *Client) Realname() string {
func (client *Client) IsExpiredAlwaysOn(config *Config) (result bool) { func (client *Client) IsExpiredAlwaysOn(config *Config) (result bool) {
client.stateMutex.Lock() client.stateMutex.Lock()
defer client.stateMutex.Unlock() defer client.stateMutex.Unlock()
return client.checkAlwaysOnExpirationNoMutex(config) return client.checkAlwaysOnExpirationNoMutex(config, false)
} }
func (client *Client) checkAlwaysOnExpirationNoMutex(config *Config) (result bool) { func (client *Client) checkAlwaysOnExpirationNoMutex(config *Config, ignoreRegistration bool) (result bool) {
if !(client.registered && client.alwaysOn) { if !((client.registered || ignoreRegistration) && client.alwaysOn) {
return false return false
} }
deadline := time.Duration(config.Accounts.Multiclient.AlwaysOnExpiration) deadline := time.Duration(config.Accounts.Multiclient.AlwaysOnExpiration)