diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-09-06 13:05:22 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-09-06 13:05:22 +0100 |
commit | 4f8baab0c47432401036e639e12d65257bd6bb3d (patch) | |
tree | 1570528894d933a533b2a3fda13b65fc32ac218f /synapse/federation/transport/server.py | |
parent | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter (diff) | |
parent | Merge tag 'v0.33.3.1' (diff) | |
download | synapse-4f8baab0c47432401036e639e12d65257bd6bb3d.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r-- | synapse/federation/transport/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 7a993fd1cf..3972922ff9 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -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") |