Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 00:24:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Call UserDirectoryHandler methods directly

Browse source 
Turns out that the user directory handling is fairly racey as a bunch
of stuff assumes that the processing happens on master, which it doesn't
when there is a synapse.app.user_dir worker. So lets just call the
function directly until we actually get round to fixing it, since it
doesn't make the situation any worse.
This commit is contained in:
Erik Johnston 2018-08-17 15:24:16 +01:00
parent 782689bd40
commit 91cdb6de08
4 changed files with 8 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

26
synapse/handlers/profile.py
View file

@ -25,7 +25,6 @@ from synapse.api.errors import (
SynapseError,
)
from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.replication.http.profile import ReplicationHandleProfileChangeRestServlet
from synapse.types import UserID, get_domain_from_id
from ._base import BaseHandler
@ -47,10 +46,6 @@ class WorkerProfileHandler(BaseHandler):
self.user_directory_handler = hs.get_user_directory_handler()
self._notify_master_profile_change = (
ReplicationHandleProfileChangeRestServlet.make_client(hs)
)
@defer.inlineCallbacks
def get_profile(self, user_id):
target_user = UserID.from_string(user_id)
@ -166,16 +161,10 @@ class WorkerProfileHandler(BaseHandler):
)
if self.hs.config.user_directory_search_all_users:
if self.hs.config.worker_app is None:
profile = yield self.store.get_profileinfo(target_user.localpart)
yield self.user_directory_handler.handle_local_profile_change(
target_user.to_string(), profile
)
else:
yield self._notify_master_profile_change(
requester=requester,
user_id=target_user.to_string(),
)
profile = yield self.store.get_profileinfo(target_user.localpart)
yield self.user_directory_handler.handle_local_profile_change(
target_user.to_string(), profile
)
yield self._update_join_states(requester, target_user)
@ -225,16 +214,11 @@ class WorkerProfileHandler(BaseHandler):
target_user.localpart, new_avatar_url
)
if self.hs.config.worker_app is None:
if self.hs.config.user_directory_search_all_users:
profile = yield self.store.get_profileinfo(target_user.localpart)
yield self.user_directory_handler.handle_local_profile_change(
target_user.to_string(), profile
)
else:
yield self._notify_master_profile_change(
requester=requester,
user_id=target_user.to_string(),
)
yield self._update_join_states(requester, target_user)