summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2017-01-05 13:47:42 +0000
committerGitHub <noreply@github.com>2017-01-05 13:47:42 +0000
commitdafd50d178ef36710130ffb830929f4a9ed3710c (patch)
tree1181b9f2343cc283136d413abdfbe848a70daee3 /synapse/state.py
parentBump version and changelog to v0.18.6-rc3 (diff)
parentFix case (diff)
downloadsynapse-dafd50d178ef36710130ffb830929f4a9ed3710c.tar.xz
Merge pull request #1767 from matrix-org/matthew/resolve_state_group_logging
log call paths for resolve_state_group
Diffstat (limited to 'synapse/state.py')
-rw-r--r--synapse/state.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/state.py b/synapse/state.py
index b4eca0e5d5..bbca59b1e8 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -123,6 +123,7 @@ class StateHandler(object):
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
 
+        logger.info("calling resolve_state_groups from get_current_state");
         ret = yield self.resolve_state_groups(room_id, latest_event_ids)
         state = ret.state
 
@@ -147,6 +148,7 @@ class StateHandler(object):
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
 
+        logger.info("calling resolve_state_groups from get_current_state_ids");
         ret = yield self.resolve_state_groups(room_id, latest_event_ids)
         state = ret.state
 
@@ -158,6 +160,7 @@ class StateHandler(object):
 
     @defer.inlineCallbacks
     def get_current_user_in_room(self, room_id, latest_event_ids=None):
+        logger.info("calling resolve_state_groups from get_current_user_in_room");
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
         entry = yield self.resolve_state_groups(room_id, latest_event_ids)
@@ -223,6 +226,7 @@ class StateHandler(object):
             context.prev_state_events = []
             defer.returnValue(context)
 
+        logger.info("calling resolve_state_groups from compute_event_context");
         if event.is_state():
             entry = yield self.resolve_state_groups(
                 event.room_id, [e for e, _ in event.prev_events],