summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-07 14:04:50 +0100
committerGitHub <noreply@github.com>2017-06-07 14:04:50 +0100
commitf45f07ab86e2a842570da49f8f5c5aa5a1cd2ebe (patch)
tree847971cd7bf68dabe1bbfae50a29910f95806358 /synapse/notifier.py
parentMerge pull request #2248 from matrix-org/erikj/state_fixup (diff)
parentDon't start user_directory handling on workers (diff)
downloadsynapse-f45f07ab86e2a842570da49f8f5c5aa5a1cd2ebe.tar.xz
Merge pull request #2258 from matrix-org/erikj/user_dir
Don't start user_directory handling on workers
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py

index 6b1709d700..385208b574 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py
@@ -167,7 +167,6 @@ class Notifier(object): self.clock = hs.get_clock() self.appservice_handler = hs.get_application_service_handler() - self.user_directory_handler = hs.get_user_directory_handler() if hs.should_send_federation(): self.federation_sender = hs.get_federation_sender() @@ -255,8 +254,6 @@ class Notifier(object): room_stream_id ) - preserve_fn(self.user_directory_handler.notify_new_event)() - if self.federation_sender: preserve_fn(self.federation_sender.notify_new_events)( room_stream_id