Reconnect fix

This commit is contained in:
bodqhrohro 2019-12-17 03:56:11 +02:00
parent 10aae376f7
commit 05a9aca537
2 changed files with 23 additions and 3 deletions

View file

@ -146,6 +146,7 @@ func (c *Client) Disconnect() {
_, err := c.client.Close() _, err := c.client.Close()
if err != nil { if err != nil {
log.Errorf("Couldn't close the Telegram instance: %v; %#v", err, c) log.Errorf("Couldn't close the Telegram instance: %v; %#v", err, c)
c.forceClose()
} }
} }
@ -198,13 +199,16 @@ func (c *Client) interactor() {
} }
gateway.SendPresence(c.xmpp, c.jid, gateway.SPStatus("Logged in "+c.Session.Login)) gateway.SendPresence(c.xmpp, c.jid, gateway.SPStatus("Logged in "+c.Session.Login))
case client.TypeAuthorizationStateClosed:
log.Warn("Closing the updates listener") return
c.listener.Close()
} }
} }
} }
func (c *Client) forceClose() {
c.listener.Close()
}
// Online checks if the updates listener is alive // Online checks if the updates listener is alive
func (c *Client) Online() bool { func (c *Client) Online() bool {
return c.listener != nil && c.listener.IsActive() return c.listener != nil && c.listener.IsActive()

View file

@ -90,6 +90,12 @@ func (c *Client) updateHandler() {
} }
c.updateFile(typedUpdate) c.updateFile(typedUpdate)
log.Debugf("%#v", typedUpdate.File) log.Debugf("%#v", typedUpdate.File)
case client.TypeUpdateAuthorizationState:
typedUpdate, ok := update.(*client.UpdateAuthorizationState)
if !ok {
uhOh()
}
c.updateAuthorizationState(typedUpdate)
default: default:
// log only handled types // log only handled types
continue continue
@ -242,3 +248,13 @@ func (c *Client) updateFile(update *client.UpdateFile) {
log.Errorf("Error creating symlink: %v", err) log.Errorf("Error creating symlink: %v", err)
} }
} }
func (c *Client) updateAuthorizationState(update *client.UpdateAuthorizationState) {
switch update.AuthorizationState.AuthorizationStateType() {
case client.TypeAuthorizationStateClosing:
log.Warn("Closing the updates listener")
case client.TypeAuthorizationStateClosed:
log.Warn("Closed the updates listener")
c.forceClose()
}
}