[Nagios-checkins] nagios/base sehandlers.c,1.62,1.63

Ethan Galstad egalstad at users.sourceforge.net
Tue Sep 21 15:10:21 UTC 2010


Update of /cvsroot/nagios/nagios/base
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5452/base

Modified Files:
	sehandlers.c 
Log Message:
Fixes for format errors in event handler logging (Guillaume Rousse)

Index: sehandlers.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/sehandlers.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** sehandlers.c	28 Aug 2010 13:50:40 -0000	1.62
--- sehandlers.c	21 Sep 2010 15:10:19 -0000	1.63
***************
*** 297,301 ****
  		asprintf(&raw_logentry,"GLOBAL SERVICE EVENT HANDLER: %s;%s;$SERVICESTATE$;$SERVICESTATETYPE$;$SERVICEATTEMPT$;%s\n",svc->host_name,svc->description,global_service_event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,processed_logentry);
  		}
  
--- 297,301 ----
  		asprintf(&raw_logentry,"GLOBAL SERVICE EVENT HANDLER: %s;%s;$SERVICESTATE$;$SERVICESTATETYPE$;$SERVICEATTEMPT$;%s\n",svc->host_name,svc->description,global_service_event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,"%s",processed_logentry);
  		}
  
***************
*** 397,401 ****
  		asprintf(&raw_logentry,"SERVICE EVENT HANDLER: %s;%s;$SERVICESTATE$;$SERVICESTATETYPE$;$SERVICEATTEMPT$;%s\n",svc->host_name,svc->description,svc->event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,processed_logentry);
  		}
  
--- 397,401 ----
  		asprintf(&raw_logentry,"SERVICE EVENT HANDLER: %s;%s;$SERVICESTATE$;$SERVICESTATETYPE$;$SERVICEATTEMPT$;%s\n",svc->host_name,svc->description,svc->event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,"%s",processed_logentry);
  		}
  
***************
*** 543,547 ****
  		asprintf(&raw_logentry,"GLOBAL HOST EVENT HANDLER: %s;$HOSTSTATE$;$HOSTSTATETYPE$;$HOSTATTEMPT$;%s\n",hst->name,global_host_event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,processed_logentry);
  		}
  
--- 543,547 ----
  		asprintf(&raw_logentry,"GLOBAL HOST EVENT HANDLER: %s;$HOSTSTATE$;$HOSTSTATETYPE$;$HOSTATTEMPT$;%s\n",hst->name,global_host_event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,"%s",processed_logentry);
  		}
  
***************
*** 641,645 ****
  		asprintf(&raw_logentry,"HOST EVENT HANDLER: %s;$HOSTSTATE$;$HOSTSTATETYPE$;$HOSTATTEMPT$;%s\n",hst->name,hst->event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,processed_logentry);
  		}
  
--- 641,645 ----
  		asprintf(&raw_logentry,"HOST EVENT HANDLER: %s;$HOSTSTATE$;$HOSTSTATETYPE$;$HOSTATTEMPT$;%s\n",hst->name,hst->event_handler);
  		process_macros(raw_logentry,&processed_logentry,macro_options);
! 		logit(NSLOG_EVENT_HANDLER,FALSE,"%s",processed_logentry);
  		}
  





More information about the Nagios-commits mailing list