diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-27 20:19:36 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-27 20:19:36 +0000 |
| commit | e020574d65a994858ac53c45070ae5016090d2f3 (patch) | |
| tree | 0d759eb3f0883e0341c81f0bc1268ec175d02e11 /synapse/notifier.py | |
| parent | Wait for events if the incremental sync is empty and a timeout is given (diff) | |
| download | synapse-e020574d65a994858ac53c45070ae5016090d2f3.tar.xz | |
Fix Formatting
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index 922bf064d0..e3b6ead620 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -214,7 +214,7 @@ class Notifier(object): deferred = defer.Deferred() - from_token=StreamToken("s0","0","0") + from_token = StreamToken("s0", "0", "0") listener = [_NotificationListener( user=user, @@ -231,6 +231,7 @@ class Notifier(object): result = yield callback() if timeout: timed_out = [False] + def _timeout_listener(): timed_out[0] = True listener[0].notify(self, [], from_token, from_token) @@ -252,7 +253,6 @@ class Notifier(object): defer.returnValue(result) - def get_events_for(self, user, rooms, pagination_config, timeout): """ For the given user and rooms, return any new events for them. If there are no new events wait for up to `timeout` milliseconds for any |