Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
This commit is contained in:
commit
6101280cd9
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
# Laconica - a distributed open-source microblogging tool
|
# Laconica - a distributed open-source microblogging tool
|
||||||
|
|
||||||
|
@ -23,19 +23,30 @@
|
||||||
SDIR=`dirname $0`
|
SDIR=`dirname $0`
|
||||||
DIR=`php $SDIR/getpiddir.php`
|
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
|
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
|
||||||
|
|
||||||
FILES="$DIR/$f.*.pid"
|
FILES="$DIR/$f.*.pid"
|
||||||
for ff in "$FILES" ; do
|
for ff in "$FILES" ; do
|
||||||
|
|
||||||
echo -n "Stopping $f..."
|
PID=`cat $ff 2>/dev/null`
|
||||||
PID=`cat $ff`
|
if [ -n "$PID" ] ; then
|
||||||
kill -3 $PID
|
echo -n "Stopping $f ($PID)..."
|
||||||
if kill -9 $PID ; then
|
if kill -3 $PID 2>/dev/null ; then
|
||||||
echo "DONE."
|
count=0
|
||||||
else
|
while kill -0 $PID 2>/dev/null ; do
|
||||||
echo "FAILED."
|
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
|
fi
|
||||||
rm -f $ff
|
rm -f $ff
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue
Block a user