File nagios-2.9-sehandlers.end_time.patch of Package nagios
diff -ruN nagios-2.9-orig/base/sehandlers.c nagios-2.9/base/sehandlers.c
--- nagios-2.9-orig/base/sehandlers.c 2006-12-12 18:57:20.000000000 +0000
+++ nagios-2.9/base/sehandlers.c 2007-04-30 18:50:12.000000000 +0000
@@ -251,7 +251,9 @@
double exectime=0.0;
int result=0;
struct timeval start_time;
+#ifdef USE_EVENT_BROKER
struct timeval end_time;
+#endif
int macro_options=STRIP_ILLEGAL_MACRO_CHARS|ESCAPE_MACRO_CHARS;
#ifdef DEBUG0
@@ -307,10 +309,10 @@
write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
}
+#ifdef USE_EVENT_BROKER
/* get end time */
gettimeofday(&end_time,NULL);
-#ifdef USE_EVENT_BROKER
/* send event data to broker */
broker_event_handler(NEBTYPE_EVENTHANDLER_END,NEBFLAG_NONE,NEBATTR_NONE,GLOBAL_SERVICE_EVENTHANDLER,(void *)svc,svc->current_state,svc->state_type,start_time,end_time,exectime,event_handler_timeout,early_timeout,result,global_service_event_handler,processed_command_line,command_output,NULL);
#endif
@@ -334,7 +336,9 @@
double exectime=0.0;
int result=0;
struct timeval start_time;
+#ifdef USE_EVENT_BROKER
struct timeval end_time;
+#endif
int macro_options=STRIP_ILLEGAL_MACRO_CHARS|ESCAPE_MACRO_CHARS;
#ifdef DEBUG0
@@ -386,10 +390,10 @@
write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
}
+#ifdef USE_EVENT_BROKER
/* get end time */
gettimeofday(&end_time,NULL);
-#ifdef USE_EVENT_BROKER
/* send event data to broker */
broker_event_handler(NEBTYPE_EVENTHANDLER_END,NEBFLAG_NONE,NEBATTR_NONE,SERVICE_EVENTHANDLER,(void *)svc,svc->current_state,svc->state_type,start_time,end_time,exectime,event_handler_timeout,early_timeout,result,svc->event_handler,processed_command_line,command_output,NULL);
#endif
@@ -460,7 +464,9 @@
double exectime=0.0;
int result=0;
struct timeval start_time;
+#ifdef USE_EVENT_BROKER
struct timeval end_time;
+#endif
int macro_options=STRIP_ILLEGAL_MACRO_CHARS|ESCAPE_MACRO_CHARS;
#ifdef DEBUG0
@@ -516,10 +522,10 @@
write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
}
+#ifdef USE_EVENT_BROKER
/* get end time */
gettimeofday(&end_time,NULL);
-#ifdef USE_EVENT_BROKER
/* send event data to broker */
broker_event_handler(NEBTYPE_EVENTHANDLER_END,NEBFLAG_NONE,NEBATTR_NONE,GLOBAL_HOST_EVENTHANDLER,(void *)hst,hst->current_state,hst->state_type,start_time,end_time,exectime,event_handler_timeout,early_timeout,result,global_host_event_handler,processed_command_line,command_output,NULL);
#endif
@@ -542,7 +548,9 @@
double exectime=0.0;
int result=0;
struct timeval start_time;
+#ifdef USE_EVENT_BROKER
struct timeval end_time;
+#endif
int macro_options=STRIP_ILLEGAL_MACRO_CHARS|ESCAPE_MACRO_CHARS;
#ifdef DEBUG0
@@ -594,10 +602,10 @@
write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
}
+#ifdef USE_EVENT_BROKER
/* get end time */
gettimeofday(&end_time,NULL);
-#ifdef USE_EVENT_BROKER
/* send event data to broker */
broker_event_handler(NEBTYPE_EVENTHANDLER_END,NEBFLAG_NONE,NEBATTR_NONE,HOST_EVENTHANDLER,(void *)hst,hst->current_state,hst->state_type,start_time,end_time,exectime,event_handler_timeout,early_timeout,result,hst->event_handler,processed_command_line,command_output,NULL);
#endif