summary refs log tree commit diff
path: root/synapse/metrics/metric.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
committerErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
commit34101427417f58418a9587adfeca3d41898b5e24 (patch)
treef1cb2f39d3838b1dcf709c3f3921dbe82afdd3a5 /synapse/metrics/metric.py
parentUpdate changelog (diff)
parentMerge pull request #992 from matrix-org/erikj/psutil_conditional (diff)
downloadsynapse-34101427417f58418a9587adfeca3d41898b5e24.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/metrics/metric.py')
-rw-r--r--synapse/metrics/metric.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/metrics/metric.py b/synapse/metrics/metric.py
index 7becbe0491..e81af29895 100644
--- a/synapse/metrics/metric.py
+++ b/synapse/metrics/metric.py
@@ -16,8 +16,6 @@
 
 from itertools import chain
 
-import psutil
-
 
 # TODO(paul): I can't believe Python doesn't have one of these
 def map_concat(func, items):
@@ -167,9 +165,10 @@ class MemoryUsageMetric(object):
     UPDATE_HZ = 2  # number of times to get memory per second
     WINDOW_SIZE_SEC = 30  # the size of the window in seconds
 
-    def __init__(self, hs):
+    def __init__(self, hs, psutil):
         clock = hs.get_clock()
         self.memory_snapshots = []
+
         self.process = psutil.Process()
 
         clock.looping_call(self._update_curr_values, 1000 / self.UPDATE_HZ)