http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71205
Revision: 71205
Author: daniel
Date: 2010-08-17 15:19:12 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
more resillience
Modified Paths:
--------------
trunk/extensions/XMLRC/bridge/udp2xmpp.py
trunk/extensions/XMLRC/client/rcclient.py
Modified: trunk/extensions/XMLRC/bridge/udp2xmpp.py
===================================================================
--- trunk/extensions/XMLRC/bridge/udp2xmpp.py 2010-08-17 15:15:28 UTC (rev
71204)
+++ trunk/extensions/XMLRC/bridge/udp2xmpp.py 2010-08-17 15:19:12 UTC (rev
71205)
@@ -304,9 +304,9 @@
for sock, conn in connection_sockets.items():
if ( not test and not conn.is_connected() ) or ( test and not
conn.test_connection() ):
if test:
- self.warn( "is_connected for connection %s returned false
(%s)" % (repr(conn), context), *exec_info );
+ self.warn( "test_connection for connection %s returned
false (%s)" % (repr(conn), context), *exec_info );
else:
- self.warn( "test_connection for connection %s failed (%s)"
% (repr(conn), context), *exec_info );
+ self.warn( "is_connected for connection %s failed (%s)" %
(repr(conn), context), *exec_info );
broken.add(conn)
remove.add(sock)
Modified: trunk/extensions/XMLRC/client/rcclient.py
===================================================================
--- trunk/extensions/XMLRC/client/rcclient.py 2010-08-17 15:15:28 UTC (rev
71204)
+++ trunk/extensions/XMLRC/client/rcclient.py 2010-08-17 15:19:12 UTC (rev
71205)
@@ -168,7 +168,8 @@
self.warn("connection lost, reconnecting...")
if self.xmpp.reconnectAndReauth():
- self.warn("re-connect successful.")
+ sockets = ( self.xmpp.Connection._sock, )
+ self.info("re-connect successful.")
self.on_connect()
except Exception, e:
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
