diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:21:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:21:33 +0000 |
| commit | 08e70231c9947321a39c878d4c6eca96e5a2226d (patch) | |
| tree | ca956ee4047223b265dcde0d0c14e47a61f17bb7 | |
| parent | Remove unused import (diff) | |
| parent | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-08e70231c9947321a39c878d4c6eca96e5a2226d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 3aecc1ca51..0eb2ff95ca 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -802,7 +802,7 @@ class FederationHandler(BaseHandler): missing_auth = event_auth_events - seen_events 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. try: 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(): # Do auth conflict res. - logger.debug("Different auth: %s", different_auth) + logger.info("Different auth: %s", different_auth) different_events = yield defer.gatherResults( [ @@ -892,6 +892,8 @@ class FederationHandler(BaseHandler): context.state_group = None 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. # We can't rove an auth failure. do_resolution = False |