diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
| commit | 88964b987e1d80d2dc9e81fc3ebc51afd9defbe1 (patch) | |
| tree | c98c28e51a8d52a8878cf2d888a4a110a835d8a8 /synapse/handlers/profile.py | |
| parent | Document the additional routes for the event_creator worker (diff) | |
| parent | Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-check (diff) | |
| download | synapse-88964b987e1d80d2dc9e81fc3ebc51afd9defbe1.tar.xz | |
Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs
Diffstat (limited to 'synapse/handlers/profile.py')
| -rw-r--r-- | synapse/handlers/profile.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 9800e24453..3465a787ab 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -31,14 +31,17 @@ class ProfileHandler(BaseHandler): def __init__(self, hs): super(ProfileHandler, self).__init__(hs) - self.federation = hs.get_replication_layer() - self.federation.register_query_handler( + self.federation = hs.get_federation_client() + hs.get_federation_registry().register_query_handler( "profile", self.on_profile_query ) self.user_directory_handler = hs.get_user_directory_handler() - self.clock.looping_call(self._update_remote_profile_cache, self.PROFILE_UPDATE_MS) + if hs.config.worker_app is None: + self.clock.looping_call( + self._update_remote_profile_cache, self.PROFILE_UPDATE_MS, + ) @defer.inlineCallbacks def get_profile(self, user_id): @@ -233,7 +236,7 @@ class ProfileHandler(BaseHandler): ) for room_id in room_ids: - handler = self.hs.get_handlers().room_member_handler + handler = self.hs.get_room_member_handler() try: # Assume the target_user isn't a guest, # because we don't let guests set profile or avatar data. |