[omd-commits] OMD Git: omd: apache: fix shutdown of apache in case of timeout

git version control git at mathias-kettner.de
Wed Dec 21 17:11:33 CET 2011


Module:   omd
Branch:   master
Commit:   d91b8c6b3492167fc79c75e7499f7f0fa258d069
URL:      http://omdistro.org/projects/omd/repository/revisions/d91b8c6b3492167fc79c75e7499f7f0fa258d069

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Wed Dec 21 17:11:24 2011 +0100
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Wed Dec 21 17:11:24 2011 +0100

apache: fix shutdown of apache in case of timeout

---

 Changelog                                  |    2 ++
 packages/apache-omd/skel/etc/init.d/apache |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 8543c57..cb0d4b0 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,6 @@
 This file documents the revision history for the Open Monitoring Distribution
+0.54
+          - mod_python: Fix "omd stop apache", which was sometimes timing out
 
 0.52
 
diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index 69a546e..7357b52 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -55,7 +55,7 @@ apache_wait_stop() {
   if [ -n "${pid:-}" ]; then
     i=0
     while kill -0 "${pid:-}" 2> /dev/null;  do
-      if [ $i = '60' ]; then
+      if [ $i = '120' ]; then
         kill_stale_php_cgis
         return 1
       else



More information about the omd-commits mailing list