diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-09 11:38:13 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-09 11:38:13 +0000 |
commit | 484867d35dfc99314053c58020a562d29b68da68 (patch) | |
tree | b3075131453083b31b54a0eae8022a81065ca6df /synapse/federation/transaction_queue.py | |
parent | clean up changelog (diff) | |
parent | Merge pull request #4362 from matrix-org/erikj/better_errors (diff) | |
download | synapse-484867d35dfc99314053c58020a562d29b68da68.tar.xz |
Merge branch 'develop' into release-v0.34.1
Diffstat (limited to 'synapse/federation/transaction_queue.py')
-rw-r--r-- | synapse/federation/transaction_queue.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 4640513497..fe787abaeb 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -522,8 +522,13 @@ class TransactionQueue(object): ) except FederationDeniedError as e: logger.info(e) + except HttpResponseException as e: + logger.warning( + "TX [%s] Received %d response to transaction: %s", + destination, e.code, e, + ) except RequestSendFailed as e: - logger.warning("(TX [%s] Failed to send transaction: %s", destination, e) + logger.warning("TX [%s] Failed to send transaction: %s", destination, e) for p, _ in pending_pdus: logger.info("Failed to send event %s to %s", p.event_id, |