r71205 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r71204‎ | r71205 | r71206 >
Date:15:19, 17 August 2010
Author:daniel
Status:deferred
Tags:
Comment:
more resillience
Modified paths:
  • /trunk/extensions/XMLRC/bridge/udp2xmpp.py (modified) (history)
  • /trunk/extensions/XMLRC/client/rcclient.py (modified) (history)

Diff [purge]

Index: trunk/extensions/XMLRC/bridge/udp2xmpp.py
@@ -304,9 +304,9 @@
305305 for sock, conn in connection_sockets.items():
306306 if ( not test and not conn.is_connected() ) or ( test and not conn.test_connection() ):
307307 if test:
308 - self.warn( "is_connected for connection %s returned false (%s)" % (repr(conn), context), *exec_info );
 308+ self.warn( "test_connection for connection %s returned false (%s)" % (repr(conn), context), *exec_info );
309309 else:
310 - self.warn( "test_connection for connection %s failed (%s)" % (repr(conn), context), *exec_info );
 310+ self.warn( "is_connected for connection %s failed (%s)" % (repr(conn), context), *exec_info );
311311
312312 broken.add(conn)
313313 remove.add(sock)
Index: trunk/extensions/XMLRC/client/rcclient.py
@@ -168,7 +168,8 @@
169169 self.warn("connection lost, reconnecting...")
170170
171171 if self.xmpp.reconnectAndReauth():
172 - self.warn("re-connect successful.")
 172+ sockets = ( self.xmpp.Connection._sock, )
 173+ self.info("re-connect successful.")
173174 self.on_connect()
174175
175176 except Exception, e:

Status & tagging log