diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-08 15:16:16 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-08 15:16:16 +0000 |
| commit | 2bb5f035affda14742ab715033570616621c0000 (patch) | |
| tree | 9348a7051ebb1d264afa47b2ce2d87c8b19f5523 /synapse/util/ratelimitutils.py | |
| parent | Merge pull request #562 from matrix-org/erikj/push_metric (diff) | |
| parent | Fix up logcontexts (diff) | |
| download | synapse-2bb5f035affda14742ab715033570616621c0000.tar.xz | |
Merge pull request #564 from matrix-org/erikj/logcontext
Fix up logcontexts
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 ea321bc6a9..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) |