Fix logging context warnings when losing replication connection

changelog.d/10984.misc

@@ -0,0 +1 @@
+Fix spurious "Expected logging context replication_command_handler-############### was lost" warnings when losing the replication connection.

synapse/replication/tcp/protocol.py

@@ -434,8 +434,9 @@ def on_connection_closed(self):
         if self.transport:
             self.transport.unregisterProducer()
 
-        # mark the logging context as finished
-        self._logging_context.__exit__(None, None, None)
+        # mark the logging context as finished by triggering `__exit__()`
+        with self._logging_context:
+            pass
 
     def __str__(self):
         addr = None

synapse/replication/tcp/redis.py

@@ -182,8 +182,9 @@ def connectionLost(self, reason):
         super().connectionLost(reason)
         self.synapse_handler.lost_connection(self)
 
-        # mark the logging context as finished
-        self._logging_context.__exit__(None, None, None)
+        # mark the logging context as finished by triggering `__exit__()`
+        with self._logging_context:
+            pass
 
     def send_command(self, cmd: Command):
         """Send a command if connection has been established.