diff options
| author | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
| commit | 92b3dc3219ccabc6997c66197a3b879dc49f5597 (patch) | |
| tree | 083acae90fadadf500918d58754a628feff86351 /synapse/federation/transaction_queue.py | |
| parent | Use if not results rather than len, as per feedback. (diff) | |
| parent | Fix upgrade instructions (diff) | |
| download | synapse-92b3dc3219ccabc6997c66197a3b879dc49f5597.tar.xz | |
Merge branch 'develop' into pushrules2
Diffstat (limited to 'synapse/federation/transaction_queue.py')
| -rw-r--r-- | synapse/federation/transaction_queue.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 7d30c924d1..741a4e7a1a 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -224,6 +224,8 @@ class TransactionQueue(object): ] try: + self.pending_transactions[destination] = 1 + limiter = yield get_retry_limiter( destination, self._clock, @@ -239,8 +241,6 @@ class TransactionQueue(object): len(pending_failures) ) - self.pending_transactions[destination] = 1 - logger.debug("TX [%s] Persisting transaction...", destination) transaction = Transaction.create_new( @@ -287,7 +287,7 @@ class TransactionQueue(object): code = 200 if response: - for e_id, r in getattr(response, "pdus", {}).items(): + for e_id, r in response.get("pdus", {}).items(): if "error" in r: logger.warn( "Transaction returned error for %s: %s", |