summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-23 16:45:22 +0100
committerErik Johnston <erik@matrix.org>2018-07-23 16:45:22 +0100
commite1eb147f2aed1e2f3d77f2f37882ddd925aa9c70 (patch)
treebe294ba59c868492f82139479d48eb88c4caba94 /synapse/handlers/message.py
parentFixup limiter (diff)
parentMerge pull request #3582 from matrix-org/erikj/fixup_stateless (diff)
downloadsynapse-e1eb147f2aed1e2f3d77f2f37882ddd925aa9c70.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index 1a2bf06870..53a976aee5 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py
@@ -807,8 +807,9 @@ class EventCreationHandler(object): # If we're a worker we need to hit out to the master. if self.config.worker_app: yield send_event_to_master( - self.hs.get_clock(), - self.http_client, + clock=self.hs.get_clock(), + store=self.store, + client=self.http_client, host=self.config.worker_replication_host, port=self.config.worker_replication_http_port, requester=requester,