summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swift/proxy/server.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/swift/proxy/server.py b/swift/proxy/server.py
index a0cc1443d..6956dc652 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:
- self.error_limit(node)
+ except (Exception, Timeout):
self.exception_occurred(node, self.server_type,
_('Trying to %(method)s %(path)s') %
{'method': method, 'path': path})