Quellcode durchsuchen

Ensure that any queue daemons are killed on removal

Bob Mottram vor 8 Jahren
Ursprung
Commit
256273e6b9
2 geänderte Dateien mit 5 neuen und 0 gelöschten Zeilen
  1. 3
    0
      src/freedombone-app-gnusocial
  2. 2
    0
      src/freedombone-app-postactiv

+ 3
- 0
src/freedombone-app-gnusocial Datei anzeigen

437
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
437
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
438
         ./scripts/stopdaemons.sh
438
         ./scripts/stopdaemons.sh
439
     fi
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
     if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
443
     if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
441
         rm -rf /var/www/$GNUSOCIAL_DOMAIN_NAME
444
         rm -rf /var/www/$GNUSOCIAL_DOMAIN_NAME
442
     fi
445
     fi

+ 2
- 0
src/freedombone-app-postactiv Datei anzeigen

415
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
415
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
416
         ./scripts/stopdaemons.sh
416
         ./scripts/stopdaemons.sh
417
     fi
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
     if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
421
     if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
420
         rm -rf /var/www/$POSTACTIV_DOMAIN_NAME
422
         rm -rf /var/www/$POSTACTIV_DOMAIN_NAME