openstack/swift
Code Issues Proposed changes

reverted unneeded changes in proxy server

Browse Source
This commit is contained in:
John Dickinson 2011-05-12 10:57:35 -05:00
parent 119ad8cff5
commit 990700aec1
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swift/proxy/server.py
View File

@ -1448,21 +1448,18 @@ class BaseApplication(object):
if self.memcache is None:
self.memcache = cache_from_env(env)
req = self.update_request(Request(env))
trans_id = req.headers.get('x-trans-id')
if 'eventlet.posthooks' in env:
env['eventlet.posthooks'].append(
(self.posthooklogger, (req,), {}))
resp = self.handle_request(req)
return self.handle_request(req)(env, start_response)
else:
# Lack of posthook support means that we have to log on the
# start of the response, rather than after all the data has
# been sent. This prevents logging client disconnects
# differently than full transmissions.
resp = self.handle_request(req)
response = self.handle_request(req)(env, start_response)
self.posthooklogger(env, req)
#if trans_id:
# resp.headers['x-trans-id'] = trans_id
return resp(env, start_response)
return response
except Exception:
print "EXCEPTION IN __call__: %s: %s" % \
(traceback.format_exc(), env)