Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2258 from matrix-org/erikj/user_dir 

Don't start user_directory handling on workers
This commit is contained in:
Erik Johnston 2017-06-07 14:04:50 +01:00 committed by GitHub
parent a053ff3979 ecdd2a3658
commit f45f07ab86
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/handlers/user_directory.py
View File

@ -46,6 +46,9 @@ class UserDirectoyHandler(object):
self.state = hs.get_state_handler() self.state = hs.get_state_handler()
self.server_name = hs.hostname self.server_name = hs.hostname
self.clock = hs.get_clock() 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. # 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 # This is a set of user_id's we've inserted already

3
synapse/notifier.py
View File

@ -167,7 +167,6 @@ class Notifier(object):
self.clock = hs.get_clock() self.clock = hs.get_clock()
self.appservice_handler = hs.get_application_service_handler() self.appservice_handler = hs.get_application_service_handler()
self.user_directory_handler = hs.get_user_directory_handler()
if hs.should_send_federation(): if hs.should_send_federation():
self.federation_sender = hs.get_federation_sender() self.federation_sender = hs.get_federation_sender()
@ -255,8 +254,6 @@ class Notifier(object):
room_stream_id room_stream_id
) )
preserve_fn(self.user_directory_handler.notify_new_event)()
if self.federation_sender: if self.federation_sender:
preserve_fn(self.federation_sender.notify_new_events)( preserve_fn(self.federation_sender.notify_new_events)(
room_stream_id room_stream_id