Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list

This commit is contained in:
Erik Johnston 2018-10-25 15:25:31 +01:00
commit b94a43d5b5
91 changed files with 2361 additions and 945 deletions

View file

@ -788,7 +788,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):