summary refs log tree commit diff
path: root/synapse/storage/stream.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-30 11:42:09 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-30 11:42:09 +0000
commit8498d348d818aa2d2cb9bb9bb2775103840f355d (patch)
treecd238087e49e49e34dfa4c786411df4adb33f0be /synapse/storage/stream.py
parentFilter the recent events before applying the limit when doing an initial sync (diff)
downloadsynapse-8498d348d818aa2d2cb9bb9bb2775103840f355d.tar.xz
Fix token formatting
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r--synapse/storage/stream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 73504c8b52..3ccb6f8a61 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -316,9 +316,9 @@ class StreamStore(SQLBaseStore):
                 toke = rows[0]["stream_ordering"] - 1
                 start_token = str(_StreamToken(topo, toke))
 
-                token = (start_token, end_token)
+                token = (start_token, str(end_token))
             else:
-                token = (end_token, end_token)
+                token = (str(end_token), str(end_token))
 
             events = self._get_events_txn(
                 txn,