Compare commits

...

2 Commits

Author SHA1 Message Date
Erik Johnston
a58953f464 fixup 2020-06-25 15:38:47 +01:00
Erik Johnston
c76e176390 Add some extra debug logging to state res 2020-06-25 11:32:15 +01:00

View File

@@ -124,6 +124,9 @@ def resolve_events_with_store(
logger.debug("sorted %d power events", len(sorted_power_events))
for e in sorted_power_events:
logger.debug("Power event: %s", e)
# Now sequentially auth each one
resolved_state = yield _iterative_auth_checks(
room_id,
@@ -135,6 +138,8 @@ def resolve_events_with_store(
)
logger.debug("resolved power events")
for s in resolved_state.items():
logger.debug("resolved power state: %s", s)
# OK, so we've now resolved the power events. Now sort the remaining
# events using the mainline of the resolved power level.
@@ -421,8 +426,17 @@ def _iterative_auth_checks(
if ev.rejected_reason is None:
auth_events[key] = event_map[ev_id]
logger.debug("No current auth event for %s, using from event", key)
else:
logger.debug(
"No current auth event for %s, one from event is rejected", key
)
try:
logger.debug(
"Authing event: %s with auth_events: %s", event_id, auth_events
)
event_auth.check(
room_version_obj,
event,
@@ -430,9 +444,11 @@ def _iterative_auth_checks(
do_sig_check=False,
do_size_check=False,
)
logger.debug("Authing event: %s success", event_id)
resolved_state[(event.type, event.state_key)] = event_id
except AuthError:
except AuthError as e:
logger.debug("Authing event: %s failed: %s", event_id, e)
pass
return resolved_state
@@ -484,6 +500,9 @@ def _mainline_sort(
idx += 1
for i, ev_id in enumerate(reversed(mainline)):
logger.debug("Mainline %d: %s", i, ev_id)
mainline_map = {ev_id: i + 1 for i, ev_id in enumerate(reversed(mainline))}
event_ids = list(event_ids)
@@ -502,6 +521,9 @@ def _mainline_sort(
event_ids.sort(key=lambda ev_id: order_map[ev_id])
for event_id in event_ids:
logger.debug("Event %s has mainline %d", event_id, order_map[event_id][0])
return event_ids