diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 10:53:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-26 10:53:48 +0000 |
commit | 4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch) | |
tree | fcaea2671bf38721520191c13bb37adf18ef84c5 /synapse/app/homeserver.py | |
parent | Format changelog (diff) | |
parent | Make sure that we close cursors before returning from a query (#6408) (diff) | |
download | synapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'synapse/app/homeserver.py')
-rw-r--r-- | 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 00a7f8330e..73e2c29d06 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -636,7 +636,7 @@ def run(hs): if hs.config.report_stats: logger.info("Scheduling stats reporting for 3 hour intervals") - clock.looping_call(start_phone_stats_home, 3 * 60 * 60 * 1000, hs, stats) + clock.looping_call(start_phone_stats_home, 3 * 60 * 60 * 1000) # We need to defer this init for the cases that we daemonize # otherwise the process ID we get is that of the non-daemon process @@ -644,7 +644,7 @@ def run(hs): # We wait 5 minutes to send the first set of stats as the server can # be quite busy the first few minutes - clock.call_later(5 * 60, start_phone_stats_home, hs, stats) + clock.call_later(5 * 60, start_phone_stats_home) _base.start_reactor( "synapse-homeserver", |