diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
commit | 3ad359e5becf7834fad3034a8d18f61206ede8f1 (patch) | |
tree | 741c28822a3b5e26d229be68bc06c95a25218748 /synapse/federation/federation_server.py | |
parent | Allow backslashes in event field filters (diff) | |
parent | Merge pull request #4082 from matrix-org/rav/fix_pep8 (diff) | |
download | synapse-3ad359e5becf7834fad3034a8d18f61206ede8f1.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r-- | synapse/federation/federation_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 4efe95faa4..af0107a46e 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -800,7 +800,7 @@ class FederationHandlerRegistry(object): yield handler(origin, content) except SynapseError as e: logger.info("Failed to handle edu %r: %r", edu_type, e) - except Exception as e: + except Exception: logger.exception("Failed to handle edu %r", edu_type) def on_query(self, query_type, args): |