summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-28 11:15:27 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-28 11:15:27 +0100
commita7122692d972ce3ac787d4ecf1449f87f33e83cf (patch)
tree81ece372c764d775d1d10cc581100de006456d67 /synapse/storage/state.py
parentMerge pull request #254 from matrix-org/markjh/tox_setuptools (diff)
parentBump version and changelog (diff)
downloadsynapse-a7122692d972ce3ac787d4ecf1449f87f33e83cf.tar.xz
Merge branch 'release-v0.10.0' into develop
Conflicts:
	synapse/handlers/auth.py
	synapse/python_dependencies.py
	synapse/rest/client/v1/login.py
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r--synapse/storage/state.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index c9110e6304..9630efcfcc 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -403,8 +403,15 @@ class StateStore(SQLBaseStore):
                 state_dict = results[group]
 
             for event_id in state_ids:
-                state_event = state_events[event_id]
-                state_dict[(state_event.type, state_event.state_key)] = state_event
+                try:
+                    state_event = state_events[event_id]
+                    state_dict[(state_event.type, state_event.state_key)] = state_event
+                except KeyError:
+                    # Hmm. So we do don't have that state event? Interesting.
+                    logger.warn(
+                        "Can't find state event %r for state group %r",
+                        event_id, group,
+                    )
 
             self._state_group_cache.update(
                 cache_seq_num,