finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve synapse-workers systemd service template

Browse Source 
Is the PID magic gonna work? or will it need an ExecStartPost hack..
This commit is contained in:
Marcel Partap 2020-10-11 16:42:45 +02:00
parent 40024e9b81
commit e9241f5fb9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker@.service.j2
View File

@ -1,4 +1,6 @@
#jinja2: lstrip_blocks: "True" #jinja2: lstrip_blocks: "True"
# Instantiable worker service, running inside the synapse container
# alongside the homeserver main process.
# c.f. https://github.com/matrix-org/synapse/pull/4662 # c.f. https://github.com/matrix-org/synapse/pull/4662
[Unit] [Unit]
Description=Synapse Matrix Worker Description=Synapse Matrix Worker
@ -12,15 +14,18 @@ Type=simple
# Intentional delay, so that the homeserver (we likely depend on) can manage to start. # Intentional delay, so that the homeserver (we likely depend on) can manage to start.
ExecStartPre=/bin/sleep 5 ExecStartPre=/bin/sleep 5
# systemd ftw 🤦‍♂️ # no sane way of instancing more than one variable (systemd "cant-fix" 🤦)
# https://github.com/systemd/systemd/issues/14895#issuecomment-594123923 # c.f. https://github.com/systemd/systemd/issues/14895#issuecomment-594123923
# So use good ol' shell parameter expansion to get the worker type..
ExecStart=/bin/sh -c "WORKER=%i; WORKER=$${WORKER%%:*}; \ ExecStart=/bin/sh -c "WORKER=%i; WORKER=$${WORKER%%:*}; \
exec /usr/bin/docker exec \ exec /usr/bin/docker exec \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
matrix-synapse \ matrix-synapse \
python -m synapse.app.$${WORKER} -c /data/homeserver.yaml -c /data/worker.%i.yaml" python -m synapse.app.$${WORKER} -c /data/homeserver.yaml -c /data/worker.%i.yaml"
ExecReload=/bin/kill -HUP $MAINPID
ExecStop=/usr/bin/docker exec matrix-synapse pkill -f %i ExecStop=/usr/bin/docker exec matrix-synapse pkill -f %i
PIDFile=/matrix-run/{{ item.worker }}.port{{ item.port }}.pid
KillMode=process KillMode=process
Restart=always Restart=always
RestartSec=10 RestartSec=10