diff options
author | Matthew Hodgson <matthew@matrix.org> | 2018-07-25 17:27:49 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-25 17:27:49 +0100 |
commit | 2565804030b14eab5f1455e8a860c1fbd71d45fc (patch) | |
tree | 7cdac37c0d7a0611b54f32312fdf5028c0c91b44 /synapse/storage/devices.py | |
parent | flake8 (diff) | |
parent | Merge pull request #3603 from matrix-org/erikj/handle_outliers (diff) | |
download | synapse-2565804030b14eab5f1455e8a860c1fbd71d45fc.tar.xz |
Merge branch 'develop' into matthew/filter_members
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, ) |