diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-04 10:22:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-08 14:26:45 +0000 |
| commit | 2c1fbea5319db2c64fa486adb32b5e66680b6daf (patch) | |
| tree | f34fb636206664ffa531e30d703469ff1a6d3a19 /synapse/federation | |
| parent | Add metrics to pushers (diff) | |
| download | synapse-2c1fbea5319db2c64fa486adb32b5e66680b6daf.tar.xz | |
Fix up logcontexts
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 | ||||
| -rw-r--r-- | synapse/federation/transaction_queue.py | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index a97aa0c94a..90718192dd 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -126,10 +126,8 @@ class FederationServer(FederationBase): results = [] for pdu in pdu_list: - d = self._handle_new_pdu(transaction.origin, pdu) - try: - yield d + yield self._handle_new_pdu(transaction.origin, pdu) results.append({}) except FederationError as e: self.send_failure(e, transaction.origin) diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 622adad3ae..1928da03b3 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -103,7 +103,6 @@ class TransactionQueue(object): else: return not destination.startswith("localhost") - @defer.inlineCallbacks def enqueue_pdu(self, pdu, destinations, order): # We loop through all destinations to see whether we already have # a transaction in progress. If we do, stick it in the pending_pdus @@ -141,8 +140,6 @@ class TransactionQueue(object): deferreds.append(deferred) - yield defer.DeferredList(deferreds, consumeErrors=True) - # NO inlineCallbacks def enqueue_edu(self, edu): destination = edu.destination |