diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-22 09:37:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 09:37:10 +0100 |
commit | 77ac14b960cb8daef76062ce85fc0427749b48af (patch) | |
tree | 4a2b3af0e0404640a2ef251030cd3c2591a1d6ba /synapse/replication | |
parent | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386) (diff) | |
download | synapse-77ac14b960cb8daef76062ce85fc0427749b48af.tar.xz |
Pass around the reactor explicitly (#3385)
Diffstat (limited to 'synapse/replication')
-rw-r--r-- | synapse/replication/http/send_event.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/replication/http/send_event.py b/synapse/replication/http/send_event.py index a9baa2c1c3..f080f96cc1 100644 --- a/synapse/replication/http/send_event.py +++ b/synapse/replication/http/send_event.py @@ -21,7 +21,6 @@ from synapse.api.errors import ( from synapse.events import FrozenEvent from synapse.events.snapshot import EventContext from synapse.http.servlet import RestServlet, parse_json_object_from_request -from synapse.util.async import sleep from synapse.util.caches.response_cache import ResponseCache from synapse.util.metrics import Measure from synapse.types import Requester, UserID @@ -33,11 +32,12 @@ logger = logging.getLogger(__name__) @defer.inlineCallbacks -def send_event_to_master(client, host, port, requester, event, context, +def send_event_to_master(clock, client, host, port, requester, event, context, ratelimit, extra_users): """Send event to be handled on the master Args: + clock (synapse.util.Clock) client (SimpleHttpClient) host (str): host of master port (int): port on master listening for HTTP replication @@ -77,7 +77,7 @@ def send_event_to_master(client, host, port, requester, event, context, # If we timed out we probably don't need to worry about backing # off too much, but lets just wait a little anyway. - yield sleep(1) + yield clock.sleep(1) except MatrixCodeMessageException as e: # We convert to SynapseError as we know that it was a SynapseError # on the master process that we should send to the client. (And |