summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2009-03-08 17:40:45 +0000
committerCiaranG <ciaran@ciarang.com>2009-03-08 17:40:45 +0000
commit1df3eeba861f9f5b7be7fd1ad4298f614a6cbee5 (patch)
treed170d635b6e747c2a42a3047bd06af60d1786e05
parent2133d5a4e7fc694b097fe65282e557d99ee109ad (diff)
Added the new pinghandler to the stopdaemons script and improved the behaviour and output of the script
-rwxr-xr-xscripts/stopdaemons.sh29
1 files changed, 20 insertions, 9 deletions
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index fd4406d41..2bb8f9ecb 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Laconica - a distributed open-source microblogging tool
@@ -23,19 +23,30 @@
SDIR=`dirname $0`
DIR=`php $SDIR/getpiddir.php`
-for f in jabberhandler ombhandler publichandler smshandler \
+for f in jabberhandler ombhandler publichandler smshandler pinghandler \
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
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