From 5c297d5a63ad6afacd52d90389bdd115e89c78f7 Mon Sep 17 00:00:00 2001 From: Silke Hofstra Date: Tue, 1 Jan 2019 14:51:05 +0100 Subject: [PATCH] Add systemd-python to optional dependencies Using systemd-python allows for logging to the systemd journal, as is documented in: `synapse/contrib/systemd/log_config.yaml`. Signed-off-by: Silke Hofstra --- changelog.d/4339.feature | 1 + docker/Dockerfile-dhvirtualenv | 2 ++ synapse/python_dependencies.py | 1 + 3 files changed, 4 insertions(+) create mode 100644 changelog.d/4339.feature diff --git a/changelog.d/4339.feature b/changelog.d/4339.feature new file mode 100644 index 000000000000..cecff97b80c0 --- /dev/null +++ b/changelog.d/4339.feature @@ -0,0 +1 @@ +Add systemd-python to the optional dependencies to enable logging to the systemd journal. Install with `pip install matrix-synapse[systemd]`. diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index ab28e49291dc..a30fa3ff0d9d 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -50,7 +50,9 @@ RUN apt-get update -qq -o Acquire::Languages=none \ debhelper \ devscripts \ dh-systemd \ + libsystemd-dev \ lsb-release \ + pkg-config \ python3-dev \ python3-pip \ python3-setuptools \ diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 69c5f9fe2e65..38ce5b4a5bbe 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -73,6 +73,7 @@ "resources.consent": ["Jinja2>=2.9"], "saml2": ["pysaml2>=4.5.0"], + "systemd": ["systemd-python>=231"], "url_preview": ["lxml>=3.5.0"], "test": ["mock>=2.0"], }