[icinga-checkins] icinga.org: icinga-core/mfriedrich/cgis: idoutils: remove leftover socket file in init-script startup, e.g. from a system crash #1745

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Jul 23 20:19:21 2011 +0200

idoutils: remove leftover socket file in init-script startup, e.g. from a system crash #1745

fixes #1745

---

 Changelog    |    1 +
 rc.ido2db.in |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Changelog b/Changelog
index dc10252..60d9d27 100644
--- a/Changelog
+++ b/Changelog
@@ -62,6 +62,7 @@ FIXES
 
 * idoutils: do not update start_time of already started downtimes #1658
 * idoutils: fix started downtime update for table scheduleddowntime in oracle #1658
+* idoutils: remove leftover socket file in init-script startup, e.g. from a system crash #1745
 
 CHANGES
 https://wiki.icinga.org/display/Dev/Changes
diff --git a/rc.ido2db.in b/rc.ido2db.in
index 6361d76..33d97e1 100644
--- a/rc.ido2db.in
+++ b/rc.ido2db.in
@@ -45,6 +45,7 @@ Ido2dbBin=@bindir@/@ido2db_name@
 Ido2dbCfgFile=@sysconfdir@/ido2db.cfg
 Ido2dbVarDir=@localstatedir@
 Ido2dbRunFile=$Ido2dbVarDir/ido2db.lock
+Ido2dbSockFile=$Ido2dbVarDir/ido.sock
 Ido2dbLockDir=/var/lock/subsys
 Ido2dbLockFile=@ido2db_name@
 Ido2dbUser=@icinga_user@
@@ -146,6 +147,8 @@ case "$1" in
 			fi
 		fi
 		printf "Starting $servicename:"
+		# remove leftover sockfile, from a system crash
+		rm -f $Ido2dbSockFile
 		touch $Ido2dbRunFile
 		chown $Ido2dbUser:$Ido2dbGroup $Ido2dbRunFile
 		$Ido2dbBin -c $Ido2dbCfgFile