From 564de6cebfb6e82ddb6db2753c9de8b7d91a77a9 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 31 Mar 2020 11:55:27 +0100
Subject: [PATCH 1/2] Fix "'NoneType' has no attribute start|stop" logcontext
 errors

Fixes #7179.
---
 changelog.d/7181.misc      |  1 +
 synapse/http/site.py       | 13 ++++++-------
 synapse/logging/context.py |  5 +++++
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/7181.misc

diff --git a/changelog.d/7181.misc b/changelog.d/7181.misc
new file mode 100644
index 000000000000..731f4dcb52e4
--- /dev/null
+++ b/changelog.d/7181.misc
@@ -0,0 +1 @@
+Clean up some LoggingContext code.
diff --git a/synapse/http/site.py b/synapse/http/site.py
index e092193c9c09..ae8bd8834775 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -193,6 +193,12 @@ def connectionLost(self, reason):
         self.finish_time = time.time()
         Request.connectionLost(self, reason)
 
+        if self.logcontext is None:
+            logger.info(
+                "Connection from %s lost before request headears were read", self.client
+            )
+            return
+
         # we only get here if the connection to the client drops before we send
         # the response.
         #
@@ -236,13 +242,6 @@ def _started_processing(self, servlet_name):
     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:
diff --git a/synapse/logging/context.py b/synapse/logging/context.py
index a8eafb1c7ce9..3254d6a8dfa9 100644
--- a/synapse/logging/context.py
+++ b/synapse/logging/context.py
@@ -539,6 +539,11 @@ def set_current_context(context: LoggingContextOrSentinel) -> LoggingContextOrSe
     Returns:
         The context that was previously active
     """
+    # everything blows up if we allow current_context to be set to None, so sanity-check
+    # that now.
+    if context is None:
+        raise TypeError("'context' argument may not be None")
+
     current = current_context()
 
     if current is not context:

From a0411a31b2969d096ca1fca2fd0b546199e94484 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 31 Mar 2020 15:17:06 +0100
Subject: [PATCH 2/2] Update synapse/http/site.py

Co-Authored-By: Patrick Cloke <clokep@users.noreply.github.com>
---
 synapse/http/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/http/site.py b/synapse/http/site.py
index ae8bd8834775..32feb0d968db 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -195,7 +195,7 @@ def connectionLost(self, reason):
 
         if self.logcontext is None:
             logger.info(
-                "Connection from %s lost before request headears were read", self.client
+                "Connection from %s lost before request headers were read", self.client
             )
             return