Fix exceptions when a connection is closed before we read the headers

This fixes bugs introduced in #3700, by making sure that we behave sanely
when an incoming connection is closed before the headers are read.
pull/3723/head
Richard van der Hoff 2018-08-20 18:21:10 +01:00
parent 55e6bdf287
commit be6527325a
2 changed files with 10 additions and 2 deletions

View File

@ -182,7 +182,7 @@ class SynapseRequest(Request):
# the client disconnects. # the client disconnects.
with PreserveLoggingContext(self.logcontext): with PreserveLoggingContext(self.logcontext):
logger.warn( logger.warn(
"Error processing request: %s %s", reason.type, reason.value, "Error processing request %r: %s %s", self, reason.type, reason.value,
) )
if not self._is_processing: if not self._is_processing:
@ -219,6 +219,12 @@ class SynapseRequest(Request):
"""Log the completion of this request and update the metrics """Log the completion of this request and update the metrics
""" """
if self.logcontext is None:
# this can happen if the connection closed before we read the
# headers (so render was never called). In that case we'll already
# have logged a warning, so just bail out.
return
usage = self.logcontext.get_resource_usage() usage = self.logcontext.get_resource_usage()
if self._processing_finished_time is None: if self._processing_finished_time is None:

View File

@ -402,7 +402,9 @@ class PreserveLoggingContext(object):
__slots__ = ["current_context", "new_context", "has_parent"] __slots__ = ["current_context", "new_context", "has_parent"]
def __init__(self, new_context=LoggingContext.sentinel): def __init__(self, new_context=None):
if new_context is None:
new_context = LoggingContext.sentinel
self.new_context = new_context self.new_context = new_context
def __enter__(self): def __enter__(self):