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.
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

View file

@ -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,