diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-10-01 17:16:20 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-10-01 17:16:20 +0100 |
commit | 5908a8f6f5abd4fb08cf0c43e7ee51175d9bf7ac (patch) | |
tree | 212df92ddefaf749db59c2e431d768184540de19 /synapse/state/v1.py | |
parent | changelog (diff) | |
parent | Update instructions to point to pip install (#3985) (diff) | |
download | synapse-5908a8f6f5abd4fb08cf0c43e7ee51175d9bf7ac.tar.xz |
Merge branch 'develop' into rav/fix_missing_create_event_error
Diffstat (limited to 'synapse/state/v1.py')
-rw-r--r-- | synapse/state/v1.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index c95477d318..7a7157b352 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -65,10 +65,15 @@ def resolve_events_with_factory(state_sets, event_map, state_map_factory): for event_ids in itervalues(conflicted_state) for event_id in event_ids ) + needed_event_count = len(needed_events) if event_map is not None: needed_events -= set(iterkeys(event_map)) - logger.info("Asking for %d conflicted events", len(needed_events)) + logger.info( + "Asking for %d/%d conflicted events", + len(needed_events), + needed_event_count, + ) # dict[str, FrozenEvent]: a map from state event id to event. Only includes # the state events which are in conflict (and those in event_map) @@ -85,11 +90,16 @@ def resolve_events_with_factory(state_sets, event_map, state_map_factory): ) new_needed_events = set(itervalues(auth_events)) + new_needed_event_count = len(new_needed_events) new_needed_events -= needed_events if event_map is not None: new_needed_events -= set(iterkeys(event_map)) - logger.info("Asking for %d auth events", len(new_needed_events)) + logger.info( + "Asking for %d/%d auth events", + len(new_needed_events), + new_needed_event_count, + ) state_map_new = yield state_map_factory(new_needed_events) state_map.update(state_map_new) |