diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:57 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:57 +0000 |
| commit | 19977b465913c3cb263d88884e16f9dc13f2a05e (patch) | |
| tree | 6015e4155502d34fd8aa35fc32094d8c29981a0a /synapse/handlers/events.py | |
| parent | Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0 (diff) | |
| download | synapse-19977b465913c3cb263d88884e16f9dc13f2a05e.tar.xz | |
Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse v0.5.0
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 93dcd40324..4993c92b74 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -15,6 +15,7 @@ from twisted.internet import defer +from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logutils import log_function from ._base import BaseHandler @@ -66,9 +67,10 @@ class EventStreamHandler(BaseHandler): rm_handler = self.hs.get_handlers().room_member_handler room_ids = yield rm_handler.get_rooms_for_user(auth_user) - events, tokens = yield self.notifier.get_events_for( - auth_user, room_ids, pagin_config, timeout - ) + with PreserveLoggingContext(): + events, tokens = yield self.notifier.get_events_for( + auth_user, room_ids, pagin_config, timeout + ) chunks = [self.hs.serialize_event(e) for e in events] |