diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 19:25:45 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 19:25:45 +0000 |
| commit | d732a7a531c6c160719b6807caa62054608816fe (patch) | |
| tree | 3e132472933be427cb7ee2b73fe2d8c422f0c99d | |
| parent | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 (diff) | |
| parent | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats (diff) | |
| download | synapse-d732a7a531c6c160719b6807caa62054608816fe.tar.xz | |
Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats
* commit '01ba7b38a': Newsfile Fix phone home stats
| -rw-r--r-- | changelog.d/6336.misc | 1 | ||||
| -rw-r--r-- | synapse/app/homeserver.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/6336.misc b/changelog.d/6336.misc new file mode 100644 index 0000000000..63527ccef4 --- /dev/null +++ b/changelog.d/6336.misc @@ -0,0 +1 @@ +Remove the dependency on psutil and replace functionality with the stdlib `resource` module. 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", |