diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-10 17:30:46 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-10 17:30:46 +0000 |
| commit | c8e1da930dd4ffbc4ca409208b2d715182cd100f (patch) | |
| tree | f3f94511593d86b2320fac9c05c45d5c07e004b9 | |
| parent | Code-style fixes (diff) | |
| download | synapse-c8e1da930dd4ffbc4ca409208b2d715182cd100f.tar.xz | |
Log all the exits from _attempt_new_transaction
| -rw-r--r-- | synapse/federation/transaction_queue.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index f38aeba7cc..731019ad9f 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -157,15 +157,19 @@ class TransactionQueue(object): else: logger.info("TX [%s] is ready for retry", destination) - logger.info("TX [%s] _attempt_new_transaction", destination) - if destination in self.pending_transactions: # XXX: pending_transactions can get stuck on by a never-ending # request at which point pending_pdus_by_dest just keeps growing. # we need application-layer timeouts of some flavour of these # requests + logger.info( + "TX [%s] Transaction already in progress", + destination + ) return + logger.info("TX [%s] _attempt_new_transaction", destination) + # list of (pending_pdu, deferred, order) pending_pdus = self.pending_pdus_by_dest.pop(destination, []) pending_edus = self.pending_edus_by_dest.pop(destination, []) @@ -176,6 +180,7 @@ class TransactionQueue(object): destination, len(pending_pdus)) if not pending_pdus and not pending_edus and not pending_failures: + logger.info("TX [%s] Nothing to send", destination) return logger.debug( |