diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
| commit | e66d0bd03abc75b5a0445acadc776ba23e1090ba (patch) | |
| tree | d73f7c0c2621a27c1637223213a930e40140728d /synapse/util/ratelimitutils.py | |
| parent | Update CHANGES (diff) | |
| parent | Merge pull request #569 from matrix-org/erikj/initial_sync (diff) | |
| download | synapse-e66d0bd03abc75b5a0445acadc776ba23e1090ba.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
Diffstat (limited to 'synapse/util/ratelimitutils.py')
| -rw-r--r-- | synapse/util/ratelimitutils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/util/ratelimitutils.py b/synapse/util/ratelimitutils.py index c37d6f12e3..4076eed269 100644 --- a/synapse/util/ratelimitutils.py +++ b/synapse/util/ratelimitutils.py @@ -18,6 +18,7 @@ from twisted.internet import defer from synapse.api.errors import LimitExceededError from synapse.util.async import sleep +from synapse.util.logcontext import preserve_fn import collections import contextlib @@ -163,7 +164,7 @@ class _PerHostRatelimiter(object): "Ratelimit [%s]: sleeping req", id(request_id), ) - ret_defer = sleep(self.sleep_msec/1000.0) + ret_defer = preserve_fn(sleep)(self.sleep_msec / 1000.0) self.sleeping_requests.add(request_id) |