summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-07-20 16:32:38 +0100
committerGitHub <noreply@github.com>2016-07-20 16:32:38 +0100
commitb73dc0ef4de07a9062b858332d0a12e8805cb8b8 (patch)
treedc9379f33f92b1a1e990b77737c6e0401b4d5a8f /synapse/python_dependencies.py
parentMerge pull request #935 from matrix-org/erikj/backfill_notifs (diff)
parentMake jenkins install deps on unit tests (diff)
downloadsynapse-b73dc0ef4de07a9062b858332d0a12e8805cb8b8.tar.xz
Merge pull request #936 from matrix-org/erikj/log_rss
Add metrics for psutil derived memory usage
Diffstat (limited to '')
-rw-r--r--synapse/python_dependencies.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index e024cec0a2..799d35da5e 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -36,6 +36,7 @@ REQUIREMENTS = { "blist": ["blist"], "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], "pymacaroons-pynacl": ["pymacaroons"], + "psutil>=2.0.0": ["psutil>=2.0.0"], } CONDITIONAL_REQUIREMENTS = { "web_client": {