Add timeout exceptions to the proxy _make_request error handler

2011-04-07 16:03:43 +00:00 · 2011-04-07 16:03:43 +00:00 · 4bd088e6b8
commit 4bd088e6b8
parent 92dc9fa448
1 changed files with 1 additions and 1 deletions
--- 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') %