[icinga-checkins] icinga.org: icinga-core/mfriedrich/cgis: core: fix retain status file over an init script reload #1579

git at icinga.org git at icinga.org
Thu Jun 9 14:11:43 CEST 2011


Module: icinga-core
Branch: mfriedrich/cgis
Commit: f6df0307e9daf69a9f38bcfbf8f220edc99a0558
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f6df0307e9daf69a9f38bcfbf8f220edc99a0558

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Jun  4 13:03:16 2011 +0200

core: fix retain status file over an init script reload #1579

refs #1579

---

 Changelog      |    1 +
 daemon-init.in |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index dd62151..6c2fc0b 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ ENHANCEMENTS
 
 FIXES
 * core: remove duplicated unlinks for check result files with multiple results #1615
+* core: fix retain status file over an init script reload #1579
 
 * classic ui: fix cross site scripting vulnerability in config.cgi on config expander arguments #1605
 
diff --git a/daemon-init.in b/daemon-init.in
index 416e66a..bca82f9 100644
--- a/daemon-init.in
+++ b/daemon-init.in
@@ -130,7 +130,7 @@ start(){
 				exit 1
 			else
 				echo "Icinga PID $IcingaPID not running. Removing lockfile."
-				rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile
+				rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile
 		fi
 	fi
 
@@ -180,7 +180,7 @@ case "$1" in
  		    echo 'Warning - icinga did not exit in a timely manner. Please try again.'
  		else
  		    echo 'Stopping icinga done.'
-                    rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile
+                    rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile
  		fi
 
 		;;





More information about the icinga-checkins mailing list