remove double finally

This commit is contained in:
Ilya Priven 2023-05-11 15:04:45 -04:00
parent 6d4faab6d6
commit 858b743d07
3 changed files with 24 additions and 30 deletions

View File

@ -109,17 +109,15 @@ class AsyncWorker(base.Worker):
if self.is_already_handled(respiter): if self.is_already_handled(respiter):
return False return False
try: try:
try: if isinstance(respiter, environ['wsgi.file_wrapper']):
if isinstance(respiter, environ['wsgi.file_wrapper']): resp.write_file(respiter)
resp.write_file(respiter) else:
else: for item in respiter:
for item in respiter: resp.write(item)
resp.write(item) resp.close()
resp.close()
finally:
request_time = datetime.now() - request_start
self.log.access(resp, req, environ, request_time)
finally: finally:
request_time = datetime.now() - request_start
self.log.access(resp, req, environ, request_time)
if hasattr(respiter, "close"): if hasattr(respiter, "close"):
respiter.close() respiter.close()
if resp.should_close(): if resp.should_close():

View File

@ -333,18 +333,16 @@ class ThreadWorker(base.Worker):
respiter = self.wsgi(environ, resp.start_response) respiter = self.wsgi(environ, resp.start_response)
try: try:
try: if isinstance(respiter, environ['wsgi.file_wrapper']):
if isinstance(respiter, environ['wsgi.file_wrapper']): resp.write_file(respiter)
resp.write_file(respiter) else:
else: for item in respiter:
for item in respiter: resp.write(item)
resp.write(item)
resp.close() resp.close()
finally:
request_time = datetime.now() - request_start
self.log.access(resp, req, environ, request_time)
finally: finally:
request_time = datetime.now() - request_start
self.log.access(resp, req, environ, request_time)
if hasattr(respiter, "close"): if hasattr(respiter, "close"):
respiter.close() respiter.close()

View File

@ -177,17 +177,15 @@ class SyncWorker(base.Worker):
self.alive = False self.alive = False
respiter = self.wsgi(environ, resp.start_response) respiter = self.wsgi(environ, resp.start_response)
try: try:
try: if isinstance(respiter, environ['wsgi.file_wrapper']):
if isinstance(respiter, environ['wsgi.file_wrapper']): resp.write_file(respiter)
resp.write_file(respiter) else:
else: for item in respiter:
for item in respiter: resp.write(item)
resp.write(item) resp.close()
resp.close()
finally:
request_time = datetime.now() - request_start
self.log.access(resp, req, environ, request_time)
finally: finally:
request_time = datetime.now() - request_start
self.log.access(resp, req, environ, request_time)
if hasattr(respiter, "close"): if hasattr(respiter, "close"):
respiter.close() respiter.close()
except EnvironmentError: except EnvironmentError: