diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:28:55 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:28:55 +0100 |
| commit | 357dd1871d5d7d9761321ddc7092abac9bfe3574 (patch) | |
| tree | 26a11bd98ec0167d4bf81d6117ad45f50a5e7246 /synapse/notifier.py | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Fix tests. (diff) | |
| download | synapse-357dd1871d5d7d9761321ddc7092abac9bfe3574.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: tests/handlers/test_federation.py tests/handlers/test_room.py
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index 1656717cd7..3d3fcdabdb 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -178,9 +178,13 @@ class Notifier(object): if timeout: reactor.callLater(timeout/1000, self._timeout_listener, listener) - self._register_with_keys(listener) + self._register_with_keys(listener) + yield self._check_for_updates(listener) + if not timeout: + self._timeout_listener(listener) + return def _timeout_listener(self, listener): |