diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-24 00:38:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-02-15 09:51:09 +0000 |
| commit | b07a33f0243bf2c22cc40b3b9f022b62a11b1654 (patch) | |
| tree | dcadfd972bedab93f31e9970aef41663799d8983 | |
| parent | Disable auth on room_members for now (diff) | |
| download | synapse-b07a33f0243bf2c22cc40b3b9f022b62a11b1654.tar.xz | |
Avoid doing presence updates on replication reconnect github/matrix-org-hotfixes-refactor matrix-org-hotfixes-refactor
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.
| -rw-r--r-- | synapse/app/synchrotron.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/presence.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 0ba3151991..6ce349cfba 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -215,6 +215,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 self.user_to_num_current_syncs.iteritems() if count > 0 diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 2a2cfd9339..17f577d5cd 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -445,6 +445,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() |