diff options
| author | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
| commit | 997db0464828c8e8eac7dfa055f4fcd25e89cd29 (patch) | |
| tree | d10252566e9bc96a9bdf95bcd37e4db4ead6ab62 /synapse/federation/transaction_queue.py | |
| parent | More consistent config naming (diff) | |
| parent | Merge pull request #773 from matrix-org/erikj/get_domian_from_id (diff) | |
| download | synapse-997db0464828c8e8eac7dfa055f4fcd25e89cd29.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'synapse/federation/transaction_queue.py')
| -rw-r--r-- | synapse/federation/transaction_queue.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 1928da03b3..5787f854d4 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -20,6 +20,7 @@ from .persistence import TransactionActions from .units import Transaction from synapse.api.errors import HttpResponseException +from synapse.util.async import run_on_reactor from synapse.util.logutils import log_function from synapse.util.logcontext import PreserveLoggingContext from synapse.util.retryutils import ( @@ -199,6 +200,8 @@ class TransactionQueue(object): @defer.inlineCallbacks @log_function def _attempt_new_transaction(self, destination): + yield run_on_reactor() + # list of (pending_pdu, deferred, order) if destination in self.pending_transactions: # XXX: pending_transactions can get stuck on by a never-ending |