summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2010-02-16 03:26:06 +0000
committerRafael H. Schloming <rhs@apache.org>2010-02-16 03:26:06 +0000
commit039b5540faff26ec317b111a5c322e935ae22a45 (patch)
tree350757568f568e732a355df3398a3a5b5876a04d
parentdd6cd1b9f7892cdfdc3e27b805b6152e9b35eac9 (diff)
downloadqpid-python-039b5540faff26ec317b111a5c322e935ae22a45.tar.gz
capture and report socket errors
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@910382 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/python/qpid/connection.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/python/qpid/connection.py b/qpid/python/qpid/connection.py
index 81ce446ab6..39fd7d5ff8 100644
--- a/qpid/python/qpid/connection.py
+++ b/qpid/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())