瀏覽代碼

Ensure that any queue daemons are killed on removal

Bob Mottram 8 年之前
父節點
當前提交
256273e6b9
共有 2 個檔案被更改,包括 5 行新增0 行删除
  1. 3
    0
      src/freedombone-app-gnusocial
  2. 2
    0
      src/freedombone-app-postactiv

+ 3
- 0
src/freedombone-app-gnusocial 查看文件

@@ -437,6 +437,9 @@ function remove_gnusocial {
437 437
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
438 438
         ./scripts/stopdaemons.sh
439 439
     fi
440
+    kill_pid=$(ps aux | grep /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
441
+    kill -9 $kill_pid
442
+
440 443
     if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
441 444
         rm -rf /var/www/$GNUSOCIAL_DOMAIN_NAME
442 445
     fi

+ 2
- 0
src/freedombone-app-postactiv 查看文件

@@ -415,6 +415,8 @@ function remove_postactiv {
415 415
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
416 416
         ./scripts/stopdaemons.sh
417 417
     fi
418
+    kill_pid=$(ps aux | grep /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
419
+    kill -9 $kill_pid
418 420
 
419 421
     if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
420 422
         rm -rf /var/www/$POSTACTIV_DOMAIN_NAME