[icinga-checkins] icinga.org: icinga-core/cmaser/fixes: daemonchk. cgi was never used since $IcingaCGI is not $IcingaCGIDir

git at icinga.org git at icinga.org
Sun Jul 25 00:08:30 CEST 2010


Module: icinga-core
Branch: cmaser/fixes
Commit: 0f77a121ac8928a43217c5d14608c43fa6fb09d0
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0f77a121ac8928a43217c5d14608c43fa6fb09d0

Author: Christoph Maser <cmr at financial.com>
Date:   Sun Jul 25 00:07:24 2010 +0200

daemonchk.cgi was never used since $IcingaCGI is not $IcingaCGIDir

---

 daemon-init.in |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/daemon-init.in b/daemon-init.in
index d3681b4..607a705 100644
--- a/daemon-init.in
+++ b/daemon-init.in
@@ -15,18 +15,10 @@
 status_icinga ()
 {
 
-	if test -x $IcingaCGI/daemonchk.cgi; then
-		if $IcingaCGI/daemonchk.cgi -l $IcingaRunFile; then
-		        return 0
-		else
-			return 1
-		fi
+	if ps -p $IcingaPID > /dev/null 2>&1; then
+	        return 0
 	else
-		if ps -p $IcingaPID > /dev/null 2>&1; then
-		        return 0
-		else
-			return 1
-		fi
+		return 1
 	fi
 
 	return 1
@@ -101,7 +93,6 @@ IcingaVarDir=@localstatedir@
 IcingaRunFile=@lockfile@
 IcingaLockDir=/var/lock/subsys
 IcingaLockFile=icinga
-IcingaCGIDir=@sbindir@
 IcingaUser=@icinga_user@
 IcingaGroup=@icinga_grp@
 IcingaChkFile=@localstatedir@/icinga.chk





More information about the icinga-checkins mailing list