Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / stopdaemons.sh

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index f77c789589716e412f6eb272624b2c487f10d8b8..e88fe26e22970c17ac944b188b41400f4c76908c 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -20,22 +20,31 @@
 # This program tries to stop the daemons for GNU social that were
 # previously started by startdaemons.sh
 
+ARGSG=
 SITENAME=
 SITE=
 ID="*"
 
+# stopdaemons.sh [server [path]]
+
 if [ $# -gt 0 ] ; then
        SITENAME="$1"
        SITE="-s$SITENAME"
        ID=`echo $SITENAME | sed s/\\\\./_/g`
+       ARGSG="$ARGSG -s$1"
+fi
+
+if [ $# -gt 1 ]; then
+       ARGSG="$ARGSG -p$2"
 fi
 
 SDIR=`dirname $0`
-DIR=`php $SDIR/getpiddir.php $SITE`
+DIR=`$SDIR/getpiddir.php $SITE 2>/dev/null | grep -v "FUSE_EDEADLK"`
+
+DAEMONS=`$SDIR/getvaliddaemons.php $ARGSG 2>/dev/null | grep -v "FUSE_EDEADLK"`
 
-for f in ombhandler smshandler pinghandler queuedaemon \
-        twitterhandler facebookhandler imdaemon \
-        twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do
+for f in $DAEMONS; do
+    f=$(basename $f .php)
 
        FILES="$DIR/$f.$ID.pid"
 
@@ -43,7 +52,7 @@ for f in ombhandler smshandler pinghandler queuedaemon \
 
                PID=`cat $ff 2>/dev/null`
                if [ -n "$PID" ] ; then
-                       echo -n "Stopping $f ($PID)..."
+                       echo -n "Stopping '$f' ($PID)..."
                        if kill -3 $PID 2>/dev/null ; then
                                count=0
                                while kill -0 $PID 2>/dev/null ;  do