Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Fix exceptions when a connection is closed before we read the headers
Browse files Browse the repository at this point in the history
This fixes bugs introduced in #3700, by making sure that we behave sanely
when an incoming connection is closed before the headers are read.
  • Loading branch information
richvdh committed Aug 20, 2018
1 parent 55e6bdf commit be65273
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 7 additions & 1 deletion synapse/http/site.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def connectionLost(self, reason):
# the client disconnects.
with PreserveLoggingContext(self.logcontext):
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:
Expand Down Expand Up @@ -219,6 +219,12 @@ def _finished_processing(self):
"""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()

if self._processing_finished_time is None:
Expand Down
4 changes: 3 additions & 1 deletion synapse/util/logcontext.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,9 @@ class PreserveLoggingContext(object):

__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

def __enter__(self):
Expand Down

0 comments on commit be65273

Please sign in to comment.