capture and report socket errors

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@910382 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 2 deletions

diff --git a/python/qpid/connection.py b/python/qpid/connection.py
index 81ce446ab6..39fd7d5ff8 100644
--- a/python/qpid/connection.py
+++ b/python/qpid/connection.py
@@ -163,13 +163,15 @@ class Connection(Framer):
           break
       except socket.timeout:
         if self.aborted():
+          self.close_code = (None, "connection timed out")
           self.detach_all()
-          raise Closed("connection timed out")
+          break
         else:
           continue
       except socket.error, e:
+        self.close_code = (None, str(e))
         self.detach_all()
-        raise Closed(e)
+        break
       frame_dec.write(data)
       seg_dec.write(*frame_dec.read())
       op_dec.write(*seg_dec.read())