From 1031bd25f8f37413f4101b0a049a598f1d95f8d3 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 24 Nov 2017 00:38:44 +0000 Subject: [PATCH] Avoid doing presence updates on replication reconnect Presence is supposed to be disabled on matrix.org, so we shouldn't send a load of USER_SYNC commands every time the synchrotron reconnects to the master. --- synapse/app/synchrotron.py | 2 ++ synapse/handlers/presence.py | 1 + 2 files changed, 3 insertions(+) diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 3cade3c68e..67a2d2b7db 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -214,6 +214,8 @@ class SynchrotronPresence(object): yield self.notify_from_replication(states, stream_id) def get_currently_syncing_users(self): + # presence is disabled on matrix.org, so we return the empty set + return set() return [ user_id for user_id, count in iteritems(self.user_to_num_current_syncs) if count > 0 diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index c7336020a2..95953efb08 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -467,6 +467,7 @@ class PresenceHandler(object): Returns: set(str): A set of user_id strings. """ + # presence is disabled on matrix.org, so we return the empty set return set() syncing_user_ids = { user_id for user_id, count in self.user_to_num_current_syncs.items()