diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-04 17:26:41 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-04 17:26:41 +0000 |
| commit | 1758187715db13cce9085c20fa866f7bbeed7680 (patch) | |
| tree | 151b669f040baaaad81b4f79d2ccc619932595c1 /synapse/notifier.py | |
| parent | Merge pull request #346 from matrix-org/markjh/remove_lock_manager (diff) | |
| parent | Merge branch 'develop' into daniel/removesomelies (diff) | |
| download | synapse-1758187715db13cce9085c20fa866f7bbeed7680.tar.xz | |
Merge pull request #339 from matrix-org/daniel/removesomelies
Remove unused arguments and code
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index a78ee3c1e7..b69da63d43 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -269,7 +269,7 @@ class Notifier(object): logger.exception("Failed to notify listener") @defer.inlineCallbacks - def wait_for_events(self, user, rooms, timeout, callback, + def wait_for_events(self, user, timeout, callback, from_token=StreamToken("s0", "0", "0", "0", "0")): """Wait until the callback returns a non empty response or the timeout fires. @@ -328,7 +328,7 @@ class Notifier(object): defer.returnValue(result) @defer.inlineCallbacks - def get_events_for(self, user, rooms, pagination_config, timeout, + def get_events_for(self, user, pagination_config, timeout, only_room_events=False): """ 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 @@ -369,7 +369,7 @@ class Notifier(object): defer.returnValue(None) result = yield self.wait_for_events( - user, rooms, timeout, check_for_updates, from_token=from_token + user, timeout, check_for_updates, from_token=from_token ) if result is None: |