diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-02 14:54:27 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-02 14:54:27 +0000 |
| commit | b2d211847651414d67d4935683e32c76eb944029 (patch) | |
| tree | 25ca81b14a72192a89c9399b3d80180ac124ca14 /synapse/federation/transaction_queue.py | |
| parent | Merge pull request #83 from matrix-org/nofile_limit_config (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu (diff) | |
| download | synapse-b2d211847651414d67d4935683e32c76eb944029.tar.xz | |
Merge pull request #88 from matrix-org/batched_get_pdu
Batched get pdu
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", |