[icinga-checkins] icinga.org: icinga-core/r1.2: core: fix parsing of long plugin output for async host checks (Jochen Bern) #1046

git at icinga.org git at icinga.org
Thu Jan 13 15:57:29 CET 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Dec  6 15:19:10 2010 +0100

core: fix parsing of long plugin output for async host checks (Jochen Bern) #1046

fixes #1046

---

 Changelog     |    9 +++++----
 base/checks.c |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 682b3ca..69f29df 100644
--- a/Changelog
+++ b/Changelog
@@ -2,7 +2,9 @@
 Icinga 1.3.x Change Log
 #######################
 
-1.3.0 - 16/02/2011
+1.2.2 - 16/02/2011
+
+- backported partly from 1.3.x tree
 
 ENHANCEMENTS
 * classic ui: add instance hostname to html title #954
@@ -15,11 +17,9 @@ ENHANCEMENTS
 * idoutils: add index to table icinga_statehistory for usage in reporting module #957
 
 FIXES
-* core: base/utils: Refactor my_fcopy() (Andreas Ericsson) #427
-* core: base/nebmods: Replace local file-copy hack with my_fdcopy() (Andreas Ericsson) #424
-* core: force my_free() macro users to end the statement with a semi-colon (Andreas Ericsson) #927
 * core: fix problem with extra whitespace in command definition and ePN (Jason Young) #918
 * core: fix NOTIFICATIONTYPE MACRO never became CUSTOM (Alexey Dvoryanchikov) #950
+* core: fix parsing of long plugin output for async host checks (Jochen Bern) #1046
 
 * classic ui: change servicestatus letter color to default black, not grey #946
 * classic ui: fix waste of cpu in status summary (TomTom) #933
@@ -34,6 +34,7 @@ FIXES
 * install: fix LD_LIBRARY_PATH export on non bash in idoutils init script (Alexander Skwar) #936
 * install: add log2ido for adding archived logs onto socket/rdbms #926
 
+
 1.2.1 - 25/10/2010
 
 ENHANCEMENTS:
diff --git a/base/checks.c b/base/checks.c
index 3bfd554..0f4105e 100644
--- a/base/checks.c
+++ b/base/checks.c
@@ -3465,7 +3465,7 @@ int handle_async_host_check_result_3x(host *temp_host, check_result *queued_chec
 	my_free(temp_host->perf_data);
 
 	/* parse check output to get: (1) short output, (2) long output, (3) perf data */
-	parse_check_output(queued_check_result->output,&temp_host->plugin_output,&temp_host->long_plugin_output,&temp_host->perf_data,FALSE,TRUE);
+	parse_check_output(queued_check_result->output,&temp_host->plugin_output,&temp_host->long_plugin_output,&temp_host->perf_data,TRUE,TRUE);
 
 	/* make sure we have some data */
 	if(temp_host->plugin_output==NULL || !strcmp(temp_host->plugin_output,"")){





More information about the icinga-checkins mailing list