summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-03-06 13:21:32 +0000
committerGitHub <noreply@github.com>2019-03-06 13:21:32 +0000
commite9aa40199417e8384a25abdc172afc47ceb8d07e (patch)
tree7c0745a0512d91a75a56b4ead25f3cba5e62583c
parentRun `black` on synapse/handlers/user_directory.py (#4812) (diff)
downloadsynapse-e9aa40199417e8384a25abdc172afc47ceb8d07e.tar.xz
Remove redundant changes from synapse/replication/tcp/streams.py (#4813)
This was some hacky code (introduced in c10c71e70d) to make the presence stream
do nothing on hotfixes. We now ensure that no replication clients subscribe to
the presence stream, so this is redundant.
-rw-r--r--synapse/replication/tcp/streams.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/tcp/streams.py b/synapse/replication/tcp/streams.py

index d49973634e..728746bd12 100644 --- a/synapse/replication/tcp/streams.py +++ b/synapse/replication/tcp/streams.py
@@ -265,8 +265,8 @@ class PresenceStream(Stream): store = hs.get_datastore() presence_handler = hs.get_presence_handler() - self.current_token = lambda: 0 - self.update_function = lambda _a, _b: [] + self.current_token = store.get_current_presence_token + self.update_function = presence_handler.get_all_presence_updates super(PresenceStream, self).__init__(hs)