Attachment 1028876 Details for Bug 1181005 – set connection.reconnect to false on socket errors

[patch] set connection.reconnect to false on socket errors

bz1181005_1.patch (text/plain), 2.00 KB, created by Ernie on 2015-05-22 16:53:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ernie

Created: 2015-05-22 16:53:44 UTC

Size: 2.00 KB

patch

obsolete

>diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
>index 7c30e5d..f4bc9f0 100644
>--- a/qpid/python/qpid/messaging/driver.py
>+++ b/qpid/python/qpid/messaging/driver.py
>@@ -433,7 +433,7 @@ class Driver:
>       else:
>         self.close_engine()
>     except socket.error, e:
>-      self.close_engine(ConnectionError(text=str(e)))
>+      self.close_engine(ConnectionError(text="Socket error: %s" % str(e)), True)
> 
>     self.update_status()
> 
>@@ -444,9 +444,12 @@ class Driver:
>       self.connection._condition.gc()
>     self.connection._waiter.notifyAll()
> 
>-  def close_engine(self, e=None):
>+  def close_engine(self, e=None, se=False):
>     if e is None:
>       e = ConnectionError(text="connection aborted")
>+    # socket errors can't reconnect using the same connection
>+    if se:
>+      self.connection.reconnect = False
> 
>     if (self.connection.reconnect and
>         (self.connection.reconnect_limit is None or
>@@ -495,7 +498,7 @@ class Driver:
>       sent = self.engine.read(n)
>       rawlog.debug("SENT[%s]: %r", self.log_id, sent)
>     except socket.error, e:
>-      self.close_engine(e)
>+      self.close_engine(e, True)
>       notify = True
> 
>     if self.update_status() or notify:
>@@ -555,7 +558,7 @@ class Driver:
>         raise ConnectError("no such transport: %s" % self.connection.transport)
>       self.schedule()
>     except socket.error, e:
>-      self.close_engine(ConnectError(text=str(e)))
>+      self.close_engine(ConnectError(text="socket error: %s" % str(e)), True)
> 
> DEFAULT_DISPOSITION = Disposition(None)
> 
>@@ -897,10 +900,11 @@ class Engine:
>     return self._sessions[op.channel]
> 
>   def do_session_detached(self, dtc):
>-    sst = self._sessions.pop(dtc.channel)
>-    ssn = sst.session
>-    del self._attachments[ssn]
>-    ssn.closed = True
>+    if dtc.channel in self._sessions:
>+      sst = self._sessions.pop(dtc.channel)
>+      ssn = sst.session
>+      del self._attachments[ssn]
>+      ssn.closed = True
> 
>   def do_session_detach(self, dtc):
>     sst = self.get_sst(dtc)

Actions: View | Diff

Attachments on bug 1181005: 1028385 | 1028876 | 1037366