diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-25 11:54:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-25 11:54:33 +0100 |
commit | 1bfb5bed1d50f8e02e0baad63b94708ece78dacc (patch) | |
tree | 9624d14b6622584e27f9bd3ae84dfaf4dd8b7ab2 /synapse/storage/devices.py | |
parent | Merge pull request #3597 from matrix-org/erikj/did_forget (diff) | |
parent | Fix unit tests (diff) | |
download | synapse-1bfb5bed1d50f8e02e0baad63b94708ece78dacc.tar.xz |
Merge pull request #3604 from matrix-org/rav/background_process_fixes
Wrap a number of things that run in the background
Diffstat (limited to 'synapse/storage/devices.py')
-rw-r--r-- | synapse/storage/devices.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index cc3cdf2ebc..52dccb1507 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -21,6 +21,7 @@ from canonicaljson import json from twisted.internet import defer from synapse.api.errors import StoreError +from synapse.metrics.background_process_metrics import run_as_background_process from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList from ._base import Cache, SQLBaseStore @@ -711,6 +712,9 @@ class DeviceStore(SQLBaseStore): logger.info("Pruned %d device list outbound pokes", txn.rowcount) - return self.runInteraction( - "_prune_old_outbound_device_pokes", _prune_txn + run_as_background_process( + "prune_old_outbound_device_pokes", + self.runInteraction, + "_prune_old_outbound_device_pokes", + _prune_txn, ) |