svn commit: r916739 - /qpid/trunk/qpid/python/qpid/messaging/driver.py

[rh...@apache.org]

Author: rhs
Date: Fri Feb 26 16:19:09 2010
New Revision: 916739

URL: http://svn.apache.org/viewvc?rev=916739&view=rev
Log:
fixed reconnect

Modified:
    qpid/trunk/qpid/python/qpid/messaging/driver.py

Modified: qpid/trunk/qpid/python/qpid/messaging/driver.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/driver.py?rev=916739&r1=916738&r2=916739&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging/driver.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/driver.py Fri Feb 26 16:19:09 2010
@@ -350,7 +350,7 @@
     if e is None:
       e = "connection aborted"
 
-    if (recoverable and self.connection.reconnect and
+    if (self.connection.reconnect and
         (self.connection.reconnect_limit is None or
          self.connection.reconnect_limit <= 0 or
          self._attempts <= self.connection.reconnect_limit)):
@@ -359,7 +359,7 @@
       else:
         delay = self.connection.reconnect_delay
       self._timeout = time.time() + delay
-      log.warn("recoverable error[attempt %s]: %s" % (self._attempts, err))
+      log.warn("recoverable error[attempt %s]: %s" % (self._attempts, e))
       if delay > 0:
         log.warn("sleeping %s seconds" % delay)
       self._retrying = True
@@ -420,6 +420,8 @@
       host, port = self._hosts[self._host]
       if self._retrying:
         log.warn("trying: %s:%s", host, port)
+      self.engine = Engine(self.connection)
+      self.engine.open()
       rawlog.debug("OPEN[%s]: %s:%s", self.log_id, host, port)
       self._socket = connect(host, port)
       if self._retrying:
@@ -428,8 +430,6 @@
       self._attempts = 0
       self._host = 0
       self._retrying = False
-      self.engine = Engine(self.connection)
-      self.engine.open()
     except socket.error, e:
       self._host = (self._host + 1) % len(self._hosts)
       self.close_engine(e)



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org