summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-21 15:11:42 +0100
committerGitHub <noreply@github.com>2019-06-21 15:11:42 +0100
commit2f8491daef57d045f26e3280db182769882c84bf (patch)
tree56bf7fe661a7ac65c7c5c4215bb0daaac7410a29
parentMerge pull request #5513 from matrix-org/erikj/fix_messages_token (diff)
downloadsynapse-2f8491daef57d045f26e3280db182769882c84bf.tar.xz
Fix logging error when a tampered event is detected. (#5500)
-rw-r--r--changelog.d/5500.bugfix1
-rw-r--r--synapse/federation/federation_base.py1
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/5500.bugfix b/changelog.d/5500.bugfix
new file mode 100644
index 0000000000..624c678435
--- /dev/null
+++ b/changelog.d/5500.bugfix
@@ -0,0 +1 @@
+Fix logging error when a tampered event is detected.
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py
index 58b929363f..1e925b19e7 100644
--- a/synapse/federation/federation_base.py
+++ b/synapse/federation/federation_base.py
@@ -163,7 +163,6 @@ class FederationBase(object):
                         logger.warning(
                             "Event %s content has been tampered, redacting",
                             pdu.event_id,
-                            pdu.get_pdu_json(),
                         )
                     return redacted_event