Correctly register shutdown handler for presence workers (#11518)

David Robertson · web-flow · commit 2a3ec6facf79 · 2021-12-07T12:34:38.000Z
Fixes #11517
diff --git a/changelog.d/11518.bugfix b/changelog.d/11518.bugfix
@@ -0,0 +1 @@
+Fix a regression in Synapse 1.48.0 where presence workers would not clear their presence updates over replication on shutdown.
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
@@ -421,7 +421,7 @@ def __init__(self, hs: "HomeServer"):
             self._on_shutdown,
         )
 
-    def _on_shutdown(self) -> None:
+    async def _on_shutdown(self) -> None:
         if self._presence_enabled:
             self.hs.get_tcp_replication().send_command(
                 ClearUserSyncsCommand(self.instance_id)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix a regression in Synapse 1.48.0 where presence workers would not clear their presence updates over replication on shutdown.`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ def __init__(self, hs: "HomeServer"):`
`421`	`421`	`self._on_shutdown,`
`422`	`422`	`)`
`423`	`423`
`424`		`- def _on_shutdown(self) -> None:`
	`424`	`+ async def _on_shutdown(self) -> None:`
`425`	`425`	`if self._presence_enabled:`
`426`	`426`	`self.hs.get_tcp_replication().send_command(`
`427`	`427`	`ClearUserSyncsCommand(self.instance_id)`