changeset d90d9aee1358 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=d90d9aee1358 description: Remove some unneeded bits in the xmpp ping code. Add additional logging.

diffstat:

src/common/connection.py | 5 +++-- src/common/connection_handlers.py | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r b5d07e1048e9 -r d90d9aee1358 src/common/connection.py --- a/src/common/connection.py Sun Dec 20 13:37:56 2009 +0100 +++ b/src/common/connection.py Sun Dec 20 23:16:58 2009 +0100 @@ -1309,8 +1309,8 @@

def _on_xmpp_ping_answer(self, iq_obj): id_ = unicode(iq_obj.getAttr('id')) - if id_ == self.awaiting_xmpp_ping_id: - self.awaiting_xmpp_ping_id = None + assert id_ == self.awaiting_xmpp_ping_id + self.awaiting_xmpp_ping_id = None

def sendPing(self, pingTo=None): """ @@ -2226,6 +2226,7 @@ def check_pingalive(self): if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect + log.warn("No reply received for keepalive ping. Reconnecting.") self._disconnectedReconnCB()

def _reconnect_alarm(self): diff -r b5d07e1048e9 -r d90d9aee1358 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Dec 20 13:37:56 2009 +0100 +++ b/src/common/connection_handlers.py Sun Dec 20 23:16:58 2009 +0100 @@ -981,8 +981,6 @@ self.dispatch('ENTITY_TIME', (jid_stripped, resource, '')) self.entity_time_ids.remove(id_) return - if id_ == self.awaiting_xmpp_ping_id: - self.awaiting_xmpp_ping_id = None errmsg = iq_obj.getErrorMsg() errcode = iq_obj.getErrorCode() self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode))