summary refs log tree commit diff
path: root/synapse/util/ratelimitutils.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-07-17 15:43:33 +0100
committerDavid Baker <dave@matrix.org>2018-07-17 15:43:33 +0100
commit1d11d9323d1d5eb419cbced9417f58d155c68255 (patch)
tree7b35de324a19d67f7fab5e6bc9c637c9c2253a71 /synapse/util/ratelimitutils.py
parentMerge pull request #3502 from matrix-org/matthew/dinsic-tweak-display-names (diff)
parentchangelog (diff)
downloadsynapse-1d11d9323d1d5eb419cbced9417f58d155c68255.tar.xz
Merge remote-tracking branch 'origin/master' into dinsic
Diffstat (limited to 'synapse/util/ratelimitutils.py')
-rw-r--r--synapse/util/ratelimitutils.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/util/ratelimitutils.py b/synapse/util/ratelimitutils.py

index 0ab63c3d7d..c5a45cef7c 100644 --- a/synapse/util/ratelimitutils.py +++ b/synapse/util/ratelimitutils.py
@@ -17,7 +17,6 @@ from twisted.internet import defer from synapse.api.errors import LimitExceededError -from synapse.util.async import sleep from synapse.util.logcontext import ( run_in_background, make_deferred_yieldable, PreserveLoggingContext, @@ -153,7 +152,7 @@ class _PerHostRatelimiter(object): "Ratelimit [%s]: sleeping req", id(request_id), ) - ret_defer = run_in_background(sleep, self.sleep_msec / 1000.0) + ret_defer = run_in_background(self.clock.sleep, self.sleep_msec / 1000.0) self.sleeping_requests.add(request_id)