Update copyright dates in files modified in 2009

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

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 08e1d4714ff8643549864575fe5cbc333f0c4d5f..50155865896a8870623efb78328f2fd69d555ee5 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Laconica - a distributed open-source microblogging tool
 
-# Copyright (C) 2008, Controlez-Vous, Inc.
+# Copyright (C) 2008, 2009, Control Yourself, 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
@@ -23,19 +23,30 @@
 SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
-for f in jabberhandler ombhandler publichandler smshandler \
-        xmppconfirmhandler xmppdaemon; do
+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