diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-19 11:04:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 11:04:18 +0100 |
| commit | c754e006f4860718057ad6dded91e66f6239bb57 (patch) | |
| tree | 6101a439c55c0f6d41c8d13cf5ff985e21fd9d51 /synapse/federation | |
| parent | Move v1-only APIs into their own module & isolate deprecated ones (#3460) (diff) | |
| parent | Make Distributor run its processes as a background process (diff) | |
| download | synapse-c754e006f4860718057ad6dded91e66f6239bb57.tar.xz | |
Merge pull request #3556 from matrix-org/rav/background_processes
Run things as background processes
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/transaction_queue.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 5c5a73b73c..6996d6b695 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -168,7 +168,7 @@ class TransactionQueue(object): # fire off a processing loop in the background run_as_background_process( - "process_transaction_queue", + "process_event_queue_for_federation", self._process_event_queue_loop, ) @@ -434,14 +434,11 @@ class TransactionQueue(object): logger.debug("TX [%s] Starting transaction loop", destination) - # Drop the logcontext before starting the transaction. It doesn't - # really make sense to log all the outbound transactions against - # whatever path led us to this point: that's pretty arbitrary really. - # - # (this also means we can fire off _perform_transaction without - # yielding) - with logcontext.PreserveLoggingContext(): - self._transaction_transmission_loop(destination) + run_as_background_process( + "federation_transaction_transmission_loop", + self._transaction_transmission_loop, + destination, + ) @defer.inlineCallbacks def _transaction_transmission_loop(self, destination): |