diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-07 14:04:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 14:04:50 +0100 |
| commit | f45f07ab86e2a842570da49f8f5c5aa5a1cd2ebe (patch) | |
| tree | 847971cd7bf68dabe1bbfae50a29910f95806358 | |
| parent | Merge pull request #2248 from matrix-org/erikj/state_fixup (diff) | |
| parent | Don't start user_directory handling on workers (diff) | |
| download | synapse-f45f07ab86e2a842570da49f8f5c5aa5a1cd2ebe.tar.xz | |
Merge pull request #2258 from matrix-org/erikj/user_dir
Don't start user_directory handling on workers
| -rw-r--r-- | synapse/handlers/user_directory.py | 3 | ||||
| -rw-r--r-- | synapse/notifier.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py index 4e568de8c4..43eb1c78e9 100644 --- a/synapse/handlers/user_directory.py +++ b/synapse/handlers/user_directory.py @@ -46,6 +46,9 @@ class UserDirectoyHandler(object): self.state = hs.get_state_handler() self.server_name = hs.hostname self.clock = hs.get_clock() + self.notifier = hs.get_notifier() + + self.notifier.add_replication_callback(self.notify_new_event) # When start up for the first time we need to populate the user_directory. # This is a set of user_id's we've inserted already 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 |