copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ping timeout on disconnect handler

This commit is contained in:
Philipp Hörist 2019-01-04 00:49:59 +01:00
parent b600328639
commit 5fd1e7b4bf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gajim/common/connection.py
View File

@ -675,6 +675,7 @@ class Connection(CommonConnection, ConnectionHandlers):
def _disconnect(self): def _disconnect(self):
log.info('Set state disconnected') log.info('Set state disconnected')
self.get_module('Ping').remove_timeout()
self.connected = 0 self.connected = 0
self.disable_reconnect_timer() self.disable_reconnect_timer()

4
gajim/common/modules/ping.py
View File

@ -66,10 +66,8 @@ class Ping:
self.remove_timeout() self.remove_timeout()
def _reconnect(self) -> None: def _reconnect(self) -> None:
if not app.config.get_per('accounts', self._account, 'active'): if not app.account_is_connected(self._account):
# Account may have been disabled
return return
# We haven't got the pong in time, disco and reconnect # We haven't got the pong in time, disco and reconnect
log.warning('No reply received for keepalive ping. Reconnecting...') log.warning('No reply received for keepalive ping. Reconnecting...')
self._con.disconnect(immediately=True) self._con.disconnect(immediately=True)