diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-26 11:44:26 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-26 11:48:08 +0100 |
| commit | 03751a64203b169cbf33b636b6d940ca6d414c31 (patch) | |
| tree | 29c6e9e328df2d07c84f9ca2a7bf80db0e894a1e /synapse/storage/transactions.py | |
| parent | Merge pull request #2970 from matrix-org/matthew/filter_members (diff) | |
| download | synapse-03751a64203b169cbf33b636b6d940ca6d414c31.tar.xz | |
Fix some looping_call calls which were broken in #3604
It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call.
Diffstat (limited to 'synapse/storage/transactions.py')
| -rw-r--r-- | synapse/storage/transactions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py index b4b479d94c..428e7fa36e 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py @@ -273,7 +273,9 @@ class TransactionStore(SQLBaseStore): return self.cursor_to_dict(txn) def _start_cleanup_transactions(self): - run_as_background_process("cleanup_transactions", self._cleanup_transactions) + return run_as_background_process( + "cleanup_transactions", self._cleanup_transactions, + ) def _cleanup_transactions(self): now = self._clock.time_msec() |