diff options
| author | David Baker <dave@matrix.org> | 2015-01-22 17:46:16 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-22 17:46:16 +0000 |
| commit | 5c6189ea3eb36409c57cd269a8931dda8f30e6ec (patch) | |
| tree | 6a6217c76e23359e2edcebd1020b4807f18b3073 /synapse/handlers/events.py | |
| parent | Oops: second part of commit dc938606 (diff) | |
| parent | Merge pull request #30 from matrix-org/client_api_restructure (diff) | |
| download | synapse-5c6189ea3eb36409c57cd269a8931dda8f30e6ec.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/rest/__init__.py
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 54ab27004f..75fb941008 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -70,10 +70,8 @@ class EventStreamHandler(BaseHandler): pagin_config.from_token = None rm_handler = self.hs.get_handlers().room_member_handler - logger.debug("BETA") room_ids = yield rm_handler.get_rooms_for_user(auth_user) - logger.debug("ALPHA") with PreserveLoggingContext(): events, tokens = yield self.notifier.get_events_for( auth_user, room_ids, pagin_config, timeout |