summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-09-08 14:26:47 +0100
committerGitHub <noreply@github.com>2016-09-08 14:26:47 +0100
commit2117c409a01231de146eb38330e3941ea2564e4a (patch)
tree806152a98d66013b94882c85cb1cb6129be62e78 /synapse/federation/federation_server.py
parentLog delta files we're applying (diff)
parentMerge branch 'develop' into markjh/direct_to_device_federation (diff)
downloadsynapse-2117c409a01231de146eb38330e3941ea2564e4a.tar.xz
Merge pull request #1074 from matrix-org/markjh/direct_to_device_federation
Send device messages over federation
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 5621655098..3fa7b2315c 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -188,7 +188,7 @@ class FederationServer(FederationBase):
             except SynapseError as e:
                 logger.info("Failed to handle edu %r: %r", edu_type, e)
             except Exception as e:
-                logger.exception("Failed to handle edu %r", edu_type, e)
+                logger.exception("Failed to handle edu %r", edu_type)
         else:
             logger.warn("Received EDU of type %s with no handler", edu_type)