summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-05 18:29:57 +0000
committerGitHub <noreply@github.com>2019-11-05 18:29:57 +0000
commit01ba7b38a7d892616c57cd9629624fba1c3d5f02 (patch)
tree5a42e6d7c9580f52bde87c897f1ca03a9f4389bf
parentMerge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 (diff)
parentNewsfile (diff)
downloadsynapse-01ba7b38a7d892616c57cd9629624fba1c3d5f02.tar.xz
Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats
Fix phone home stats
-rw-r--r--changelog.d/6336.misc1
-rw-r--r--synapse/app/homeserver.py4
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",