openstack/deb-python-eventlet
Code Issues Proposed changes

wsgi: further cleanup

Browse Source
This commit is contained in:
redbo
2009-06-24 16:39:44 -05:00
parent e8acf88839
commit 8be282a60d
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eventlet/wsgi.py
View File

@@ -246,19 +246,11 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
headers_set[:] = [status, capitalized_headers] headers_set[:] = [status, capitalized_headers]
return write return write
try:
result = self.application(self.environ, start_response)
except Exception, e:
exc = ''.join(traceback.format_exception(*sys.exc_info()))
print exc
if not headers_set:
start_response("500 Internal Server Error", [('Content-type', 'text/plain')])
write(exc)
return
if not headers_sent and hasattr(result, '__len__'):
headers_set[1].append(('content-length', str(sum(map(len, result)))))
try: try:
try: try:
result = self.application(self.environ, start_response)
if not headers_sent and hasattr(result, '__len__'):
headers_set[1].append(('content-length', str(sum(map(len, result)))))
towrite = [] towrite = []
for data in result: for data in result:
if data: if data:
@@ -268,12 +260,12 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
if use_chunked[0]: if use_chunked[0]:
wfile.write('0\r\n\r\n') wfile.write('0\r\n\r\n')
except Exception, e: except Exception, e:
self.close_connection = 1
exc = traceback.format_exc() exc = traceback.format_exc()
print exc print exc
if not headers_set: if not headers_set:
start_response("500 Internal Server Error", [('Content-type', 'text/plain')]) start_response("500 Internal Server Error", [('Content-type', 'text/plain')])
write(exc) write(exc)
return
finally: finally:
if hasattr(result, 'close'): if hasattr(result, 'close'):
result.close() result.close()