summary refs log tree commit diff
path: root/synapse/app
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/app
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/app')
-rw-r--r--synapse/app/event_creator.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/event_creator.py b/synapse/app/event_creator.py
index 2c9a735859..a2bdaf2a2c 100644
--- a/synapse/app/event_creator.py
+++ b/synapse/app/event_creator.py
@@ -58,6 +58,7 @@ from synapse.rest.client.v1.room import (
 )
 from synapse.server import HomeServer
 from synapse.storage.engines import create_engine
+from synapse.storage.user_directory import UserDirectoryStore
 from synapse.util.httpresourcetree import create_resource_tree
 from synapse.util.logcontext import LoggingContext
 from synapse.util.manhole import manhole
@@ -67,6 +68,7 @@ logger = logging.getLogger("synapse.app.event_creator")
 
 
 class EventCreatorSlavedStore(
+    UserDirectoryStore,
     DirectoryStore,
     SlavedTransactionStore,
     SlavedProfileStore,