summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-04 16:35:08 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-04 16:35:08 +0000
commitb7a3be693b06b325d74060df6f809580e1225acd (patch)
tree6ccd3c898749e0ea98e820c586895b66cbc626b2 /synapse/notifier.py
parentMerge pull request #625 from matrix-org/erikj/kick_ban_sync (diff)
parentPrefill from the correct stream (diff)
downloadsynapse-b7a3be693b06b325d74060df6f809580e1225acd.tar.xz
Merge pull request #618 from matrix-org/markjh/pushrule_stream
Add a stream for push rule updates
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 3c36a20868..9b69b0333a 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -284,7 +284,7 @@ class Notifier(object):
 
     @defer.inlineCallbacks
     def wait_for_events(self, user_id, timeout, callback, room_ids=None,
-                        from_token=StreamToken("s0", "0", "0", "0", "0")):
+                        from_token=StreamToken.START):
         """Wait until the callback returns a non empty response or the
         timeout fires.
         """