From 256273e6b971c2f5a4133a714a395f0feb981df6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 4 Apr 2017 20:16:00 +0100
Subject: [PATCH] Ensure that any queue daemons are killed on removal
---
src/freedombone-app-gnusocial | 3 +++
src/freedombone-app-postactiv | 2 ++
2 files changed, 5 insertions(+)
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 7e2283e57..a20df8777 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -437,6 +437,9 @@ function remove_gnusocial {
cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
./scripts/stopdaemons.sh
fi
+ kill_pid=$(ps aux | grep /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
+ kill -9 $kill_pid
+
if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
rm -rf /var/www/$GNUSOCIAL_DOMAIN_NAME
fi
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index 5f0cdfa27..501e97a41 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -415,6 +415,8 @@ function remove_postactiv {
cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
./scripts/stopdaemons.sh
fi
+ kill_pid=$(ps aux | grep /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
+ kill -9 $kill_pid
if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
rm -rf /var/www/$POSTACTIV_DOMAIN_NAME
--
GitLab