loolwsd.service | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 8471af3f8f48f295ea98be2f23d8c117246dddb8 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Fri Nov 1 11:32:23 2019 -0400 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Mon Nov 4 09:35:34 2019 +0100
service: improve stop and reload SIGINT is the clean way of stopping the service, while SIGTERM is be the faster and rude way. So first we want to use SIGINT and only when we timeout do we want SIGTERM to be used. Here we ask systemd to stop WSD by sending SIGINT and wait for 120 seconds. After that timeout, it will assume the service is hung and needs to be aborted. We expect that by then we would have saved all documents and cleanly exited. 120 seconds should be sufficient time to save, close, and upload the open documents. Change-Id: I08321814db942d89a44cfce42885840f4afa279c (cherry picked from commit a0fddd8574305215ecd21f87d9642cfad7e15d1e) Reviewed-on: https://gerrit.libreoffice.org/81973 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/loolwsd.service b/loolwsd.service index d43d59078..93e98fd67 100644 --- a/loolwsd.service +++ b/loolwsd.service @@ -5,6 +5,8 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +KillSignal=SIGINT +TimeoutStopSec=120 User=lool KillMode=control-group Restart=always _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits