diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-26 16:03:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-26 16:03:32 +0100 |
| commit | 6d1dea337b8ae64ddfe4c1627014d09963388b0d (patch) | |
| tree | c5cefd5b0334185780ffa8d391cb2d2f70c003af /synapse/handlers/events.py | |
| parent | Changelog (diff) | |
| parent | changelog (diff) | |
| download | synapse-6d1dea337b8ae64ddfe4c1627014d09963388b0d.tar.xz | |
Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse v0.9.1
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index f9f855213b..993d33ba47 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -15,7 +15,6 @@ from twisted.internet import defer -from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logutils import log_function from synapse.types import UserID from synapse.events.utils import serialize_event @@ -81,10 +80,9 @@ class EventStreamHandler(BaseHandler): # thundering herds on restart. timeout = random.randint(int(timeout*0.9), int(timeout*1.1)) - with PreserveLoggingContext(): - events, tokens = yield self.notifier.get_events_for( - auth_user, room_ids, pagin_config, timeout - ) + events, tokens = yield self.notifier.get_events_for( + auth_user, room_ids, pagin_config, timeout + ) time_now = self.clock.time_msec() |