Fix missing logcontext for PresenceHandler.on_shutdown. (#5369)

Fixes some warnings, and a scary-looking stacktrace when sytest kills the process.
matrix-org · Jun 6, 2019 · 71063a6 · 71063a6
1 parent 89d3d7b
commit 71063a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog.d/5369.bugfix b/changelog.d/5369.bugfix
@@ -0,0 +1 @@
+Fix missing logcontext warnings on shutdown.
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
@@ -158,7 +158,13 @@ def __init__(self, hs):
         # have not yet been persisted
         self.unpersisted_users_changes = set()
 
-        hs.get_reactor().addSystemEventTrigger("before", "shutdown", self._on_shutdown)
+        hs.get_reactor().addSystemEventTrigger(
+            "before",
+            "shutdown",
+            run_as_background_process,
+            "presence.on_shutdown",
+            self._on_shutdown,
+        )
 
         self.serial_to_user = {}
         self._next_serial = 1