Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2018-09-06 13:05:22 +01:00
commit 4f8baab0c4
9 changed files with 157 additions and 47 deletions

View file

@ -353,7 +353,7 @@ class FederationSendServlet(BaseFederationServlet):
try:
code, response = yield self.handler.on_incoming_transaction(
transaction_data
origin, transaction_data,
)
except Exception:
logger.exception("on_incoming_transaction failed")