Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1822 from matrix-org/erikj/statE_logging
Browse files Browse the repository at this point in the history
Change resolve_state_groups call site logging to DEBUG
  • Loading branch information
erikjohnston authored Jan 18, 2017
2 parents f648313 + 5f027d1 commit f9058ca
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion synapse/api/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def check_host_in_room(self, room_id, host):
with Measure(self.clock, "check_host_in_room"):
latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)

logger.info("calling resolve_state_groups from check_host_in_room")
logger.debug("calling resolve_state_groups from check_host_in_room")
entry = yield self.state.resolve_state_groups(
room_id, latest_event_ids
)
Expand Down
2 changes: 1 addition & 1 deletion synapse/handlers/federation.py
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ def try_backfill(domains):

event_ids = list(extremities.keys())

logger.info("calling resolve_state_groups in _maybe_backfill")
logger.debug("calling resolve_state_groups in _maybe_backfill")
states = yield preserve_context_over_deferred(defer.gatherResults([
preserve_fn(self.state_handler.resolve_state_groups)(room_id, [e])
for e in event_ids
Expand Down
8 changes: 4 additions & 4 deletions synapse/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def get_current_state(self, room_id, event_type=None, state_key="",
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")
logger.debug("calling resolve_state_groups from get_current_state")
ret = yield self.resolve_state_groups(room_id, latest_event_ids)
state = ret.state

Expand All @@ -154,7 +154,7 @@ def get_current_state_ids(self, room_id, event_type=None, state_key="",
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")
logger.debug("calling resolve_state_groups from get_current_state_ids")
ret = yield self.resolve_state_groups(room_id, latest_event_ids)
state = ret.state

Expand All @@ -168,7 +168,7 @@ def get_current_state_ids(self, room_id, event_type=None, state_key="",
def get_current_user_in_room(self, room_id, latest_event_ids=None):
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_user_in_room")
logger.debug("calling resolve_state_groups from get_current_user_in_room")
entry = yield self.resolve_state_groups(room_id, latest_event_ids)
joined_users = yield self.store.get_joined_users_from_state(
room_id, entry.state_id, entry.state
Expand Down Expand Up @@ -232,7 +232,7 @@ def compute_event_context(self, event, old_state=None):
context.prev_state_events = []
defer.returnValue(context)

logger.info("calling resolve_state_groups from compute_event_context")
logger.debug("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],
Expand Down

0 comments on commit f9058ca

Please sign in to comment.