summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-03 09:46:40 +0100
committerErik Johnston <erik@matrix.org>2017-05-03 09:46:40 +0100
commit8346e6e696e6f0052bc0f68ee825c2b08da2387d (patch)
tree11969ca353dc86c798e3fa6fc094d6b4530ffc25 /synapse/events
parentPrefill state caches (diff)
parentMerge pull request #2178 from matrix-org/erikj/message_metrics (diff)
downloadsynapse-8346e6e696e6f0052bc0f68ee825c2b08da2387d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state
Diffstat (limited to 'synapse/events')
-rw-r--r--synapse/events/snapshot.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py
index 6be18880b9..e9a732ff03 100644
--- a/synapse/events/snapshot.py
+++ b/synapse/events/snapshot.py
@@ -50,6 +50,7 @@ class EventContext(object):
         "prev_group",
         "delta_ids",
         "prev_state_events",
+        "app_service",
     ]
 
     def __init__(self):
@@ -68,3 +69,5 @@ class EventContext(object):
         self.delta_ids = None
 
         self.prev_state_events = None
+
+        self.app_service = None