[icinga-checkins] icinga.org: icinga-core/cmaser/fixes: remove catching a SIGSEGV on not dumping core and running as daemon

git at icinga.org git at icinga.org
Sat Jul 3 22:41:49 CEST 2010


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jun 25 13:12:03 2010 +0200

remove catching a SIGSEGV on not dumping core and running as daemon

-* core: only catch SIGSEGV if we're not dumping core and running as a daemon (Andreas Ericsson)

applying this will cause idomod's 'error writing to data sink'
problems resulting in a caught SIGSEGV and shutting down the
core. Although it's an obvious problem of idomod removed for
the upcoming release.
It has to be resolved in idomod itsself afterwards.

Kudos to Andreas Bauer for reporting that.

fixes #531

---

 Changelog    |    1 -
 THANKS       |    1 +
 base/utils.c |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 518a927..f53301e 100644
--- a/Changelog
+++ b/Changelog
@@ -74,7 +74,6 @@ FIXES
 * core: fix SIGSEGV in checks.c on Solaris (Torsten Huebler)
 * core: added icinga object version variable in neb api for usage with idomod
 * core: fix notification_period inheritance for services (Gordon Messmer)
-* core: only catch SIGSEGV if we're not dumping core and running as a daemon (Andreas Ericsson)
 * core: fix for notifications not being sent out when scheduled downtime is cancelled (Daniel Pouzzner)
 * core: fix for first notification delay being calculated incorrectly, and notifications potentially going out early (reported by Pawel Malachowski)(Ethan Galstad)
 * core: error out if services defined without description in service object definition (service def and/or used templates)
diff --git a/THANKS b/THANKS
index d57cfb2..8085813 100644
--- a/THANKS
+++ b/THANKS
@@ -24,6 +24,7 @@ in various ways.  If we missed your name, let us know.
 * Luigi Balzano
 * Sebastien Barbereau
 * Wolfgang Barth
+* Andreas Bauer
 * Devin Bayer
 * Simon Beale
 * Ben Bell
diff --git a/base/utils.c b/base/utils.c
index c64f113..0a84eee 100644
--- a/base/utils.c
+++ b/base/utils.c
@@ -2120,7 +2120,7 @@ void setup_sighandler(void){
 	signal(SIGQUIT,sighandler);
 	signal(SIGTERM,sighandler);
 	signal(SIGHUP,sighandler);
-	if(daemon_dumps_core==FALSE && daemon_mode==TRUE)
+	if(daemon_dumps_core==FALSE || daemon_mode==FALSE)
 		signal(SIGSEGV,sighandler);
 
 	return;





More information about the icinga-checkins mailing list