Attachment 739604 Details for Bug 908224 – Updated patch for reconnect and reconnect_timeout

[patch] Updated patch for reconnect and reconnect_timeout

bz908224.patch (text/plain), 1.81 KB, created by Ernie on 2013-04-24 21:11:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ernie

Created: 2013-04-24 21:11:29 UTC

Size: 1.81 KB

patch

obsolete

>Index: python/qpid/messaging/endpoints.py
>===================================================================
>--- python/qpid/messaging/endpoints.py	(revision 1469528)
>+++ python/qpid/messaging/endpoints.py	(working copy)
>@@ -258,7 +264,10 @@
>     if self._open:
>       raise ConnectionError("already open")
>     self._open = True
>-    self.attach()
>+    timeout = None
>+    if self.reconnect and self.reconnect_timeout > 0:
>+        timeout = self.reconnect_timeout
>+    self.attach(timeout=timeout)
> 
>   @synchronized
>   def opened(self):
>@@ -268,7 +277,7 @@
>     return self._open
> 
>   @synchronized
>-  def attach(self):
>+  def attach(self, timeout=None):
>     """
>     Attach to the remote endpoint.
>     """
>@@ -276,7 +285,9 @@
>       self._connected = True
>       self._driver.start()
>       self._wakeup()
>-    self._ewait(lambda: self._transport_connected and not self._unlinked())
>+    if not self._ewait(lambda: self._transport_connected and not self._unlinked(), timeout=timeout):
>+      self.reconnect = False
>+      raise Timeout("Connection attach timed out")
> 
>   def _unlinked(self):
>     return [l
>Index: python/qpid/tests/messaging/endpoints.py
>===================================================================
>--- python/qpid/tests/messaging/endpoints.py	(revision 1471401)
>+++ python/qpid/tests/messaging/endpoints.py	(working copy)
>@@ -351,6 +351,16 @@
>   def testConnectionClose(self):
>     self.timeoutTest(self.conn.close)
> 
>+  def testConnectionOpen(self):
>+    options = self.connection_options()
>+    options["reconnect"] = True
>+    options["reconnect_timeout"] = self.delay()
>+    try:
>+      bad_conn = Connection.establish("badhostname", **options)
>+      assert False, "did not time out"
>+    except Timeout:
>+      pass
>+
> ACK_QC = 'test-ack-queue; {create: always}'
> ACK_QD = 'test-ack-queue; {delete: always}'
>

Actions: View | Diff

Attachments on bug 908224: 706773 | 739604