summary refs log tree commit diff
path: root/synapse/federation/persistence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-26 18:56:54 +0000
committerErik Johnston <erik@matrix.org>2019-11-26 18:56:54 +0000
commitc665d154a2de73e559a9a4d79999aeeee5cc62a8 (patch)
tree5be10050ee0a44f1c5347e4f319f537c0896c446 /synapse/federation/persistence.py
parentMerge branch 'release-v1.6.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parentRemove assertion and provide a clear warning on startup for missing public_ba... (diff)
downloadsynapse-c665d154a2de73e559a9a4d79999aeeee5cc62a8.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/federation/persistence.py')
-rw-r--r--synapse/federation/persistence.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py

index 44edcabed4..d68b4bd670 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py
@@ -44,7 +44,7 @@ class TransactionActions(object): response code and response body. """ if not transaction.transaction_id: - raise RuntimeError("Cannot persist a transaction with no " "transaction_id") + raise RuntimeError("Cannot persist a transaction with no transaction_id") return self.store.get_received_txn_response(transaction.transaction_id, origin) @@ -56,7 +56,7 @@ class TransactionActions(object): Deferred """ if not transaction.transaction_id: - raise RuntimeError("Cannot persist a transaction with no " "transaction_id") + raise RuntimeError("Cannot persist a transaction with no transaction_id") return self.store.set_received_txn_response( transaction.transaction_id, origin, code, response