summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-08-21 17:07:20 +0100
committerGitHub <noreply@github.com>2018-08-21 17:07:20 +0100
commit46c832eaac33d9787cf9589422d28ea7104ce5cb (patch)
treec9318be280979c41537a5d42d6fcacc5e379be9f /synapse/federation/transport/server.py
parentMerge pull request #3722 from matrix-org/erikj/bg_process_iteration (diff)
parentLog more detail when we fail to authenticate request (diff)
downloadsynapse-46c832eaac33d9787cf9589422d28ea7104ce5cb.tar.xz
Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keys
Don't log exceptions when failing to fetch server keys
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r--synapse/federation/transport/server.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 77969a4f38..7a993fd1cf 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -261,10 +261,10 @@ class BaseFederationServlet(object):
             except NoAuthenticationError:
                 origin = None
                 if self.REQUIRE_AUTH:
-                    logger.exception("authenticate_request failed")
+                    logger.warn("authenticate_request failed: missing authentication")
                     raise
-            except Exception:
-                logger.exception("authenticate_request failed")
+            except Exception as e:
+                logger.warn("authenticate_request failed: %s", e)
                 raise
 
             if origin: