Make psutil optional #992

erikjohnston · Aug 8, 2016

No description provided.

Maybe move the rest of the function inside the try block rather than returning here?

I prefer to keep try...except as narrow as possible, to ensure we don't accidentally consume legitimate errors.

Fair enough

NegativeMjark · Aug 8, 2016

LGTM

erikjohnston assigned NegativeMjark Aug 8, 2016

richvdh deleted the erikj/psutil_conditional branch Dec 1, 2016

@@ -68,9 +68,18 @@ def register_cache(self, *args, **kwargs):
      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

matrix-org/synapse