summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-20 11:06:02 +0100
committerErik Johnston <erik@matrix.org>2016-04-20 11:06:02 +0100
commit4cf4320593f9d3448e28819e094b42eadab6967d (patch)
tree83b026b35a250e9903ecbc2ae6cdf0cc3a057a70 /synapse
parentMerge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groups (diff)
downloadsynapse-4cf4320593f9d3448e28819e094b42eadab6967d.tar.xz
Add some logging to state resolve_events
Diffstat (limited to '')
-rw-r--r--synapse/state.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 58211f5feb..cca9167e5b 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -230,6 +230,8 @@ class StateHandler(object):
                     (cache.state_group, state, prev_states)
                 )
 
+        logger.info("Resolving state for %s with %d groups", room_id, len(state_groups))
+
         new_state, prev_states = self._resolve_events(
             state_groups.values(), event_type, state_key
         )
@@ -246,6 +248,9 @@ class StateHandler(object):
         defer.returnValue((None, new_state, prev_states))
 
     def resolve_events(self, state_sets, event):
+        logger.info(
+            "Resolving state for %s with %d groups", event.room_id, len(state_sets)
+        )
         if event.is_state():
             return self._resolve_events(
                 state_sets, event.type, event.state_key