From 888925babaa8858c4586a4903f9b53202e70f784 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Mon, 6 Dec 2021 19:14:55 +0000 Subject: [PATCH 1/2] Correctly register shutdown handler for presence workers Fixes #11517 --- synapse/handlers/presence.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 3df872c578b5..454d06c9733d 100644 --- 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) From 43f95ed8a2553170bad9fdce76e310e7460a0999 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Mon, 6 Dec 2021 19:20:56 +0000 Subject: [PATCH 2/2] Create 11518.bugfix --- changelog.d/11518.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/11518.bugfix diff --git a/changelog.d/11518.bugfix b/changelog.d/11518.bugfix new file mode 100644 index 000000000000..3c27382c7ab0 --- /dev/null +++ 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.