mirror of
https://github.com/element-hq/synapse
synced 2024-09-01 22:40:21 +00:00
Merge branch 'develop' of github.com:matrix-org/synapse into failures
This commit is contained in:
commit
08e70231c9
1 changed files with 4 additions and 2 deletions
|
@ -802,7 +802,7 @@ class FederationHandler(BaseHandler):
|
||||||
missing_auth = event_auth_events - seen_events
|
missing_auth = event_auth_events - seen_events
|
||||||
|
|
||||||
if missing_auth:
|
if missing_auth:
|
||||||
logger.debug("Missing auth: %s", missing_auth)
|
logger.info("Missing auth: %s", missing_auth)
|
||||||
# If we don't have all the auth events, we need to get them.
|
# If we don't have all the auth events, we need to get them.
|
||||||
try:
|
try:
|
||||||
remote_auth_chain = yield self.replication_layer.get_event_auth(
|
remote_auth_chain = yield self.replication_layer.get_event_auth(
|
||||||
|
@ -856,7 +856,7 @@ class FederationHandler(BaseHandler):
|
||||||
|
|
||||||
if different_auth and not event.internal_metadata.is_outlier():
|
if different_auth and not event.internal_metadata.is_outlier():
|
||||||
# Do auth conflict res.
|
# Do auth conflict res.
|
||||||
logger.debug("Different auth: %s", different_auth)
|
logger.info("Different auth: %s", different_auth)
|
||||||
|
|
||||||
different_events = yield defer.gatherResults(
|
different_events = yield defer.gatherResults(
|
||||||
[
|
[
|
||||||
|
@ -892,6 +892,8 @@ class FederationHandler(BaseHandler):
|
||||||
context.state_group = None
|
context.state_group = None
|
||||||
|
|
||||||
if different_auth and not event.internal_metadata.is_outlier():
|
if different_auth and not event.internal_metadata.is_outlier():
|
||||||
|
logger.info("Different auth after resolution: %s", different_auth)
|
||||||
|
|
||||||
# Only do auth resolution if we have something new to say.
|
# Only do auth resolution if we have something new to say.
|
||||||
# We can't rove an auth failure.
|
# We can't rove an auth failure.
|
||||||
do_resolution = False
|
do_resolution = False
|
||||||
|
|
Loading…
Reference in a new issue