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/util | |
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/util')
-rw-r--r-- | synapse/util/caches/expiringcache.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/expiringcache.py b/synapse/util/caches/expiringcache.py index 465adc54a8..ce85b2ae11 100644 --- a/synapse/util/caches/expiringcache.py +++ b/synapse/util/caches/expiringcache.py @@ -64,7 +64,7 @@ class ExpiringCache(object): return def f(): - run_as_background_process( + return run_as_background_process( "prune_cache_%s" % self._cache_name, self._prune_cache, ) |