diff options
| author | David Baker <dave@matrix.org> | 2015-01-13 13:15:51 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-13 13:15:51 +0000 |
| commit | c06a9063e1d838f776edfd79cfc8ab29c748d794 (patch) | |
| tree | bcfa472e65d4dacbab666d5787eff9293e5ccc41 /synapse/storage/__init__.py | |
| parent | Split out function to decide whether to notify or a given event (diff) | |
| parent | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-c06a9063e1d838f776edfd79cfc8ab29c748d794.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index ac3bf5cee5..fa7ad0eea8 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 OpenMarket Ltd +# Copyright 2014, 2015 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ SCHEMAS = [ # Remember to update this number every time an incompatible change is made to # database schema files, so the users will be informed on server restarts. -SCHEMA_VERSION = 10 +SCHEMA_VERSION = 11 class _RollbackButIsFineException(Exception): @@ -146,9 +146,7 @@ class DataStore(RoomMemberStore, RoomStore, elif event.type == EventTypes.Redaction: self._store_redaction(txn, event) - outlier = False - if hasattr(event.internal_metadata, "outlier"): - outlier = event.internal_metadata.outlier + outlier = event.internal_metadata.is_outlier() event_dict = { k: v |