summary refs log tree commit diff
path: root/synapse/replication/http/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-17 15:24:16 +0100
committerErik Johnston <erik@matrix.org>2018-08-17 15:26:13 +0100
commit91cdb6de08aa20f2bc7f8df906eb5b56df387309 (patch)
tree9a875a1fb049311d1b351bcb1d87f0ab91e49326 /synapse/replication/http/__init__.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... (diff)
downloadsynapse-91cdb6de08aa20f2bc7f8df906eb5b56df387309.tar.xz
Call UserDirectoryHandler methods directly
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.
Diffstat (limited to 'synapse/replication/http/__init__.py')
-rw-r--r--synapse/replication/http/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/replication/http/__init__.py b/synapse/replication/http/__init__.py

index d8487df614..19f214281e 100644 --- a/synapse/replication/http/__init__.py +++ b/synapse/replication/http/__init__.py
@@ -14,7 +14,7 @@ # limitations under the License. from synapse.http.server import JsonResource -from synapse.replication.http import federation, membership, profile, send_event +from synapse.replication.http import federation, membership, send_event REPLICATION_PREFIX = "/_synapse/replication" @@ -27,5 +27,4 @@ class ReplicationRestResource(JsonResource): def register_servlets(self, hs): send_event.register_servlets(hs, self) membership.register_servlets(hs, self) - profile.register_servlets(hs, self) federation.register_servlets(hs, self)