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/app | |
| 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/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b7e7718290..57b815d777 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -429,7 +429,7 @@ def run(hs): stats_process = [] def start_phone_stats_home(): - run_as_background_process("phone_stats_home", phone_stats_home) + return run_as_background_process("phone_stats_home", phone_stats_home) @defer.inlineCallbacks def phone_stats_home(): @@ -502,7 +502,7 @@ def run(hs): ) def generate_user_daily_visit_stats(): - run_as_background_process( + return run_as_background_process( "generate_user_daily_visits", hs.get_datastore().generate_user_daily_visits, ) |