X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fstopdaemons.sh;h=c790f1f349715f04c77c958887490ab239418951;hb=2abb01e7cb42483dd0dcce39e1aa6f9189bdaac4;hp=fd4406d415b35f766c200c5e3dc85cf2705edde5;hpb=c0af950276e54c6d4a854eb1cfd1ba00c3fea9dc;p=quix0rs-gnu-social.git

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index fd4406d415..b4a3725d8d 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-# Laconica - a distributed open-source microblogging tool
+# StatusNet - a distributed open-source microblogging tool
 
-# Copyright (C) 2008, Controlez-Vous, Inc.
+# Copyright (C) 2008, 2009, StatusNet, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,27 +17,50 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# This program tries to stop the daemons for Laconica that were
+# This program tries to stop the daemons for GNU social that were
 # previously started by startdaemons.sh
 
+SITENAME=
+SITE=
+ID="*"
+
+if [ $# -gt 0 ] ; then
+	SITENAME="$1"
+	SITE="-s$SITENAME"
+	ID=`echo $SITENAME | sed s/\\\\./_/g`
+fi
+
 SDIR=`dirname $0`
-DIR=`php $SDIR/getpiddir.php`
+DIR=`$SDIR/getpiddir.php $SITE`
+
+DAEMONS=`$SDIR/getvaliddaemons.php`
 
-for f in jabberhandler ombhandler publichandler smshandler \
-	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
+for f in $DAEMONS; do
+    f=$(basename $f .php)
+
+	FILES="$DIR/$f.$ID.pid"
 
-	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do
 
-	 	echo -n "Stopping $f..."
-	 	PID=`cat $ff`
-		kill -3 $PID
-		if kill -9 $PID ; then
-			echo "DONE."
-		else
-			echo "FAILED."
+	 	PID=`cat $ff 2>/dev/null`
+		if [ -n "$PID" ] ; then
+		 	echo -n "Stopping $f ($PID)..."
+			if kill -3 $PID 2>/dev/null ; then
+				count=0
+				while kill -0 $PID 2>/dev/null ;  do
+					sleep 1
+					count=$(($count + 1))
+					if [ $count -gt 5 ]; then break; fi
+				done
+				if kill -9 $PID 2>/dev/null ; then
+					echo "FORCIBLY TERMINATED"
+				else
+					echo "STOPPED CLEANLY"
+				fi
+			else
+				echo "NOT FOUND"
+			fi
 		fi
 		rm -f $ff
 	done
 done
-