thomas - in flumotion/branches/platform-3: . flumotion/admin

[flumotion-commit at lists.fluendo.com]

Author: thomas
Date: Wed Apr 23 16:39:53 2008
New Revision: 6542

Log:
	* flumotion/admin/admin.py:
	  Store the connector when connecting, so we can mention it when
	  we fail.



Modified:
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/admin/admin.py

Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Wed Apr 23 16:39:53 2008
@@ -1,6 +1,12 @@
 2008-04-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/admin/admin.py:
+	  Store the connector when connecting, so we can mention it when
+	  we fail.
+
+2008-04-23  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* flumotion/admin/admin.py:
 	  Tell us where we failed to connect to.
 
 2008-04-22  Thomas Vander Stichele  <thomas at apestaart dot org>

Modified: flumotion/branches/platform-3/flumotion/admin/admin.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/admin/admin.py	(original)
+++ flumotion/branches/platform-3/flumotion/admin/admin.py	Wed Apr 23 16:39:53 2008
@@ -62,6 +62,11 @@
         self.extraTenacious = extraTenacious
         self.hasBeenConnected = 0
 
+    def startedConnecting(self, connector):
+        self._connector = connector
+        return fpb.ReconnectingFPBClientFactory.startedConnecting(
+            self, connector)
+
     def clientConnectionMade(self, broker):
       self.hasBeenConnected = 1
 
@@ -113,7 +118,7 @@
             except Exception, e:
                 if self.extraTenacious:
                     self.debug('connection problem to %s: %s', 
-                               connector.getDestination(),
+                               self._connector.getDestination(),
                                log.getExceptionMessage(e))
                     self.debug('we are tenacious, so trying again later')
                     self.disconnect()