[Pkg-nagios-changes] [pkg-nagios] r1486 - nagios3/trunk/debian

[Jan Wagner]

tags 479329 pending
thanks

Author: waja-guest
Date: 2008-06-09 21:42:38 +0000 (Mon, 09 Jun 2008)
New Revision: 1486

Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/nagios3-common.nagios3.init
Log:
take care if killproc isn't smart enought

Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2008-06-09 21:25:48 UTC (rev 1485)
+++ nagios3/trunk/debian/changelog	2008-06-09 21:42:38 UTC (rev 1486)
@@ -15,6 +15,9 @@
   * add doc-base support (Closes: #479334)
   * replace depency of mailx with bsd-mailx
   * added Vcs- fields into source header's field
+  * take care if killproc isn't able to stop daemon via stop target of
+    initscript, thanks Stephen Gran <sgran at debian.org> for providing this fix
+    (Closes: #479329)
 
  -- Alexander Wirt <formorer at debian.org>  Sun, 04 May 2008 12:35:16 +0200
 

Modified: nagios3/trunk/debian/nagios3-common.nagios3.init
===================================================================
--- nagios3/trunk/debian/nagios3-common.nagios3.init	2008-06-09 21:25:48 UTC (rev 1485)
+++ nagios3/trunk/debian/nagios3-common.nagios3.init	2008-06-09 21:42:38 UTC (rev 1486)
@@ -146,6 +146,20 @@
 stop () {
     killproc -p $THEPIDFILE
     ret=$?
+    if [ `pidof nagios3 | wc -l ` -gt 0 ]; then
+        echo -n "Waiting for $NAME daemon to die.."
+        cnt=0
+        while [ `pidof nagios3 | wc -l ` -gt 0 ]; do
+            cnt=`expr "$cnt" + 1`
+            if [ "$cnt" -gt 15 ]; then
+                kill -9 `pidof nagios3`
+                break
+            fi
+            sleep 1
+            echo -n "."
+        done
+    fi
+    echo
     if ! check_named_pipe; then
       rm -f $nagiospipe
     fi