summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-22 13:06:07 +0100
committerErik Johnston <erik@matrix.org>2014-08-22 13:06:07 +0100
commit808f663ed179dcb16a315810f7f0f8a7eec77e01 (patch)
treebdc6d9bc1568c40aa48935d50ed77d1e278f6480 /synapse/storage/__init__.py
parentAdd a database-prepare-for-0.0.1.sh (diff)
downloadsynapse-808f663ed179dcb16a315810f7f0f8a7eec77e01.tar.xz
Don't return state event outlier's when paginating.
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 7732906927..d06033b980 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -105,6 +105,11 @@ class DataStore(RoomMemberStore, RoomStore,
             "processed": True,
         }
 
+        if hasattr(event, "outlier"):
+            vals["outlier"] = event.outlier
+        else:
+            vals["outlier"] = False
+
         if backfilled:
             if not self.min_token_deferred.called:
                 yield self.min_token_deferred
@@ -123,7 +128,7 @@ class DataStore(RoomMemberStore, RoomStore,
         except:
             logger.exception(
                 "Failed to persist, probably duplicate: %s",
-                event_id
+                event.event_id
             )
             return