openstack/swift
Code Issues Proposed changes

Make it so the proxy's _make_request method's error handler catches timeouts.

Browse Source
This commit is contained in:
Michael Barton
2011-04-07 19:24:55 +00:00
committed by Tarmac
parent 92dc9fa448 8642275fd2
commit bc9ec20033
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swift/proxy/server.py
View File

@@ -507,8 +507,7 @@ class Controller(object):
return resp.status, resp.reason, resp.read() return resp.status, resp.reason, resp.read()
elif resp.status == 507: elif resp.status == 507:
self.error_limit(node) self.error_limit(node)
except Exception: except (Exception, Timeout):
self.error_limit(node)
self.exception_occurred(node, self.server_type, self.exception_occurred(node, self.server_type,
_('Trying to %(method)s %(path)s') % _('Trying to %(method)s %(path)s') %
{'method': method, 'path': path}) {'method': method, 'path': path})