From 35fed8606e379a4291e49aec7254848212cb358a Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Sun, 28 Jan 2018 08:51:36 -0500 Subject: [PATCH] only spawn one process for the management daemon In 0088fb45533b349e47c7f04e95a618862735ddf1 I changed the management daemon's startup script from a symlink to a Python script to a bash script that activated the new virtualenv and then launched Python. As a result, the init.d script that starts the daemon would write the pid of bash to the pidfile, and when trying to kill it, it would kill bash but not the Python process. Using exec to start Python fixes this problem by making the Python process have the pid that the init.d script knows about. fixes #1339 --- CHANGELOG.md | 1 + setup/management.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aaa8381..6c4ade69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ In Development Control Panel: +* The background service for the control panel was not restarting on updates, leaving the old version running. This was broken in v0.26 and is now fixed. * Installing your own TLS/SSL certificate had been broken since v0.24 because the new version of openssl became stricter about CSR generation parameters. v0.26b (January 25, 2018) diff --git a/setup/management.sh b/setup/management.sh index e3b3ec06..74261296 100755 --- a/setup/management.sh +++ b/setup/management.sh @@ -100,7 +100,7 @@ rm -f /usr/local/bin/mailinabox-daemon # old path cat > $inst_dir/start <