Title: [opsview-base] [311] Add patch to fix forward port from Nagios Core, missing a forced state change due to timeout
- Revision
- 311
- Author
- tvoon
- Date
- 2013-07-12 15:32:11 +0100 (Fri, 12 Jul 2013)
Log Message
Add patch to fix forward port from Nagios Core, missing a forced state change due to timeout
Modified Paths
Added Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-07-11 16:00:45 UTC (rev 310)
+++ trunk/Makefile 2013-07-12 14:32:11 UTC (rev 311)
@@ -649,6 +649,7 @@
cd ${NAGIOS} && patch -p1 < ../patches/nagios_passive_host_svc_checks_and_host_svc_event_handlers.patch
cd ${NAGIOS} && patch -p1 < ../patches/nagios_fix_notifications_in_retention.patch
cd ${NAGIOS} && patch -p1 < ../patches/nagios_bugfix_10fe3be.patch
+ cd ${NAGIOS} && patch -p1 < ../patches/nagios_10fe3be_missing_forced_state_on_timeout.patch
if [ $(KERNEL_NAME) = Linux ] ; then \
cd ${NAGIOS} && CFLAGS="${CFLAGS}" ./configure --with-nagios-user=$(NAGIOS_USER) --with-nagios-group=$(NAGIOS_GROUP) --with-command-group=$(NAGIOS_GROUP) --with-cgiurl=/cgi-bin --with-htmurl=/ --enable-libtap ; \
elif [ $(KERNEL_NAME) = Darwin ] ; then \
Added: trunk/patches/nagios_10fe3be_missing_forced_state_on_timeout.patch
===================================================================
--- trunk/patches/nagios_10fe3be_missing_forced_state_on_timeout.patch (rev 0)
+++ trunk/patches/nagios_10fe3be_missing_forced_state_on_timeout.patch 2013-07-12 14:32:11 UTC (rev 311)
@@ -0,0 +1,11 @@
+diff -ur nagios-4.0.20130107.orig/base/checks.c nagios-4.0.20130107/base/checks.c
+--- nagios-4.0.20130107.orig/base/checks.c 2013-07-12 14:16:29.000000000 +0000
++++ nagios-4.0.20130107/base/checks.c 2013-07-12 14:27:47.000000000 +0000
+@@ -444,6 +444,7 @@
+ if(queued_check_result->early_timeout == TRUE) {
+ logit(NSLOG_RUNTIME_WARNING, TRUE, "Warning: Check of service '%s' on host '%s' timed out after %.3fs!\n", temp_service->description, temp_service->host_name, temp_service->execution_time);
+ asprintf(&temp_service->plugin_output, "(Service check timed out after %.2lf seconds)\n", temp_service->execution_time);
++ temp_service->current_state = STATE_CRITICAL;
+ }
+ /* if there was some error running the command, just skip it (this shouldn't be happening) */
+ else if(queued_check_result->exited_ok == FALSE) {
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
