diff options
author | Maxime “pep” Buquet <pep@bouah.net> | 2019-07-29 19:42:53 +0200 |
---|---|---|
committer | Maxime “pep” Buquet <pep@bouah.net> | 2019-07-29 19:42:53 +0200 |
commit | d43c8cf8788600a23a7cca6338200b007b7d854a (patch) | |
tree | 7144cdfd5d4ab54e97738488794e343e7ae34921 /poezio/core/handlers.py | |
parent | a9d17a420d98af022332d4cdf3dc8f5f8d844b71 (diff) | |
parent | dc5144fdb9f359e21e4901b523738ae1b20cbcd6 (diff) | |
download | poezio-d43c8cf8788600a23a7cca6338200b007b7d854a.tar.gz poezio-d43c8cf8788600a23a7cca6338200b007b7d854a.tar.bz2 poezio-d43c8cf8788600a23a7cca6338200b007b7d854a.tar.xz poezio-d43c8cf8788600a23a7cca6338200b007b7d854a.zip |
Merge remote-tracking branch 'origin/mr/28'
Address multiple reconnect issues. Thanks Ge0rG!
Diffstat (limited to 'poezio/core/handlers.py')
-rw-r--r-- | poezio/core/handlers.py | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py index b79a853b..c17f3761 100644 --- a/poezio/core/handlers.py +++ b/poezio/core/handlers.py @@ -1152,20 +1152,32 @@ class HandlerCore: self.core.information( "Connection to remote server failed: %s" % (error, ), 'Error') + def on_session_end(self, event): + """ + Called when a session is terminated (e.g. due to a manual disconnect or a 0198 resume fail) + """ + roster.connected = 0 + roster.modified() + for tab in self.core.get_tabs(tabs.MucTab): + tab.disconnect() + + def on_session_resumed(self, event): + """ + Called when a session is successfully resumed by 0198 + """ + self.core.information("Resumed session as %s" % self.core.xmpp.boundjid.full, 'Info') + self.core.xmpp.plugin['xep_0199'].enable_keepalive() + async def on_disconnected(self, event): """ When we are disconnected from remote server """ if 'disconnect' in config.get('beep_on').split(): curses.beep() - roster.connected = 0 # Stop the ping plugin. It would try to send stanza on regular basis self.core.xmpp.plugin['xep_0199'].disable_keepalive() - roster.modified() - for tab in self.core.get_tabs(tabs.MucTab): - tab.disconnect() msg_typ = 'Error' if not self.core.legitimate_disconnect else 'Info' - self.core.information("Disconnected from server.", msg_typ) + self.core.information("Disconnected from server%s." % (event and ": %s" % event or ""), msg_typ) if self.core.legitimate_disconnect or not config.get( 'auto_reconnect', True): return |