From 42839cc64c562a3aaea56ea23094e96682b2a944 Mon Sep 17 00:00:00 2001 From: darode Date: Mon, 29 Aug 2011 14:44:53 +0000 Subject: [PATCH] 2011-08-29 Dario Rodriguez * modules/pandora_module_factory.cc: Fixed a bug collecting some module parameters like min_warning, max_warning, min_ff_event, etc. Fixes: 3396949 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4840 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 7 +++++++ .../win32/modules/pandora_module_factory.cc | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index 56e24c612b..2441dc607b 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,10 @@ +2011-08-29 Dario Rodriguez + + * modules/pandora_module_factory.cc: Fixed a bug collecting some module + parameters like min_warning, max_warning, min_ff_event, etc. + + Fixes: 3396949 + 2011-08-19 Sancho Lerena * bin/pandora_agent.conf: Ready to get the server string from the diff --git a/pandora_agents/win32/modules/pandora_module_factory.cc b/pandora_agents/win32/modules/pandora_module_factory.cc index a60ba7dc91..cff69d42ee 100644 --- a/pandora_agents/win32/modules/pandora_module_factory.cc +++ b/pandora_agents/win32/modules/pandora_module_factory.cc @@ -105,7 +105,7 @@ parseLine (string line, string token) { retstr = " "; } } - + return retstr; } @@ -199,7 +199,7 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) { string line; line = trim (*iter); - + if (module_name == "") { module_name = parseLine (line, TOKEN_NAME); } @@ -258,22 +258,22 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) { module_post_process = parseLine (line, TOKEN_POST_PROCESS); } if (module_min_critical == "") { - module_post_process = parseLine (line, TOKEN_MIN_CRITICAL); + module_min_critical = parseLine (line, TOKEN_MIN_CRITICAL); } if (module_max_critical == "") { - module_post_process = parseLine (line, TOKEN_MAX_CRITICAL); + module_max_critical = parseLine (line, TOKEN_MAX_CRITICAL); } if (module_min_warning == "") { - module_post_process = parseLine (line, TOKEN_MIN_WARNING); + module_min_warning = parseLine (line, TOKEN_MIN_WARNING); } if (module_max_warning == "") { - module_post_process = parseLine (line, TOKEN_MAX_WARNING); + module_max_warning = parseLine (line, TOKEN_MAX_WARNING); } if (module_disabled == "") { - module_post_process = parseLine (line, TOKEN_DISABLED); + module_disabled = parseLine (line, TOKEN_DISABLED); } if (module_min_ff_event == "") { - module_post_process = parseLine (line, TOKEN_MIN_FF_EVENT); + module_min_ff_event = parseLine (line, TOKEN_MIN_FF_EVENT); } if (module_description == "") { module_description = parseLine (line, TOKEN_DESCRIPTION);