[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: fix xpddefault_{host, service}_perfdata_file_pipe not set properly on configuration re-read

git at icinga.org git at icinga.org
Tue May 18 13:30:08 CEST 2010


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue May 18 13:30:02 2010 +0200

fix xpddefault_{host,service}_perfdata_file_pipe not set properly on configuration re-read

fixes #376

---

 Changelog          |    1 +
 xdata/xpddefault.c |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Changelog b/Changelog
index d8da5a1..eba0ed3 100644
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,7 @@ FIXES
 * core: fix open() error checking in move_check_result_to_queue() (Andreas Ericsson)
 * core: base/utils.c: Refactor my_fcopy() (Andreas Ericsson)
 * core: xdata/xpddefault.c: Close perfdata files if fd's are >= 0 (Andreas Ericsson)
+* core: fix xpddefault_{host,service}_perfdata_file_pipe not set properly on configuration re-read
 
 * cgi: minor cleanups to cgiutils.c (Eric Sesterhenn)
 * cgi: fix cmd.cgi incomplete output for command description
diff --git a/xdata/xpddefault.c b/xdata/xpddefault.c
index df17c36..4a01f9a 100644
--- a/xdata/xpddefault.c
+++ b/xdata/xpddefault.c
@@ -161,6 +161,8 @@ int xpddefault_grab_config_directives(char *input){
 		xpddefault_service_perfdata_file=(char *)strdup(varvalue);
 
 	else if(!strcmp(varname,"host_perfdata_file_mode")){
+		xpddefault_host_perfdata_file_pipe=FALSE;
+
 		if(strstr(varvalue,"p")!=NULL)
 			xpddefault_host_perfdata_file_pipe=TRUE;
 		else if(strstr(varvalue,"w")!=NULL)
@@ -170,6 +172,8 @@ int xpddefault_grab_config_directives(char *input){
 	        }
 
 	else if(!strcmp(varname,"service_perfdata_file_mode")){
+		xpddefault_service_perfdata_file_pipe=FALSE;
+
 		if(strstr(varvalue,"p")!=NULL)
 			xpddefault_service_perfdata_file_pipe=TRUE;
 		else if(strstr(varvalue,"w")!=NULL)





More information about the icinga-checkins mailing list