Skip to content

Commit a5ee392

Browse files
committed
Go through start.py when launching Synapse
This allows us to benefit from helpful things it does for us, like enabling jemalloc: matrix-org/synapse#8553 We weren't going through `start.py` before, because it was causing some conflict with our `docker run --user=...` stuff, but it doesn't seem to be a problem anymore. Having done this, we won't need to do things like #941 anymore.
1 parent 3f0550b commit a5ee392

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

roles/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name {{ matrix_synapse_wor
1818
--log-driver=none \
1919
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
2020
--cap-drop=ALL \
21-
--entrypoint=python \
2221
--read-only \
2322
--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_synapse_tmp_directory_size_mb }}m \
2423
--network={{ matrix_docker_network }} \
@@ -44,7 +43,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name {{ matrix_synapse_wor
4443
{{ arg }} \
4544
{% endfor %}
4645
{{ matrix_synapse_docker_image }} \
47-
-m synapse.app.{{ matrix_synapse_worker_details.type }} -c /data/homeserver.yaml -c /data/{{ matrix_synapse_worker_config_file_name }}
46+
run -m synapse.app.{{ matrix_synapse_worker_details.type }} -c /data/homeserver.yaml -c /data/{{ matrix_synapse_worker_config_file_name }}
4847

4948

5049
ExecStop=-{{ matrix_host_command_docker }} kill {{ matrix_synapse_worker_container_name }}

roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-synapse \
3434
--log-driver=none \
3535
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
3636
--cap-drop=ALL \
37-
--entrypoint=python \
3837
--read-only \
3938
--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_synapse_tmp_directory_size_mb }}m \
4039
--network={{ matrix_docker_network }} \
@@ -62,7 +61,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-synapse \
6261
{{ arg }} \
6362
{% endfor %}
6463
{{ matrix_synapse_docker_image }} \
65-
-m synapse.app.homeserver -c /data/homeserver.yaml
64+
run -m synapse.app.homeserver -c /data/homeserver.yaml
6665

6766
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-synapse 2>/dev/null'
6867
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-synapse 2>/dev/null'

0 commit comments

Comments
 (0)