From 4bd088e6b80b7c9936d625da1c01338da9104fff Mon Sep 17 00:00:00 2001 From: Michael Barton Date: Thu, 7 Apr 2011 16:03:43 +0000 Subject: [PATCH 1/2] Add timeout exceptions to the proxy _make_request error handler --- swift/proxy/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/proxy/server.py b/swift/proxy/server.py index a0cc1443da..648d87aff1 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -507,7 +507,7 @@ class Controller(object): return resp.status, resp.reason, resp.read() elif resp.status == 507: self.error_limit(node) - except Exception: + except (Exception, Timeout, ConnectionTimeout): self.error_limit(node) self.exception_occurred(node, self.server_type, _('Trying to %(method)s %(path)s') % From 8642275fd247b51184e0046f0f810d3090844426 Mon Sep 17 00:00:00 2001 From: Michael Barton Date: Thu, 7 Apr 2011 16:15:26 +0000 Subject: [PATCH 2/2] probably should not error limit on timeouts --- swift/proxy/server.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/swift/proxy/server.py b/swift/proxy/server.py index 648d87aff1..6956dc652e 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -507,8 +507,7 @@ class Controller(object): return resp.status, resp.reason, resp.read() elif resp.status == 507: self.error_limit(node) - except (Exception, Timeout, ConnectionTimeout): - self.error_limit(node) + except (Exception, Timeout): self.exception_occurred(node, self.server_type, _('Trying to %(method)s %(path)s') % {'method': method, 'path': path})