diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-08 11:24:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-08 11:24:53 +0100 |
| commit | 34101427417f58418a9587adfeca3d41898b5e24 (patch) | |
| tree | f1cb2f39d3838b1dcf709c3f3921dbe82afdd3a5 /synapse/metrics/__init__.py | |
| parent | Update changelog (diff) | |
| parent | Merge pull request #992 from matrix-org/erikj/psutil_conditional (diff) | |
| download | synapse-34101427417f58418a9587adfeca3d41898b5e24.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/metrics/__init__.py')
| -rw-r--r-- | synapse/metrics/__init__.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py index cce3dba47c..76d5998d75 100644 --- a/synapse/metrics/__init__.py +++ b/synapse/metrics/__init__.py @@ -68,9 +68,18 @@ class Metrics(object): def register_memory_metrics(hs): - metric = MemoryUsageMetric(hs) + try: + import psutil + process = psutil.Process() + process.memory_info().rss + except (ImportError, AttributeError): + logger.warn( + "psutil is not installed or incorrect version." + " Disabling memory metrics." + ) + return + metric = MemoryUsageMetric(hs, psutil) all_metrics.append(metric) - return metric def get_metrics_for(pkg_name): |