diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
| commit | def64d6ef32ea1b2acc92e470db307e97c6eac05 (patch) | |
| tree | 8d29d7d432a5b703d15f1176ae7e720b1caa5805 /synapse/federation/transaction_queue.py | |
| parent | Add bulk fetch storage API (diff) | |
| parent | Merge pull request #764 from matrix-org/erikj/replication_logging (diff) | |
| download | synapse-def64d6ef32ea1b2acc92e470db307e97c6eac05.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
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 |