From 63cce0554d6508c83155541cf0564834fd5ec983 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 14 Jul 2011 09:52:48 +0000 Subject: [PATCH] 2011-07-14 Ramon Novoa * lib/PandoraFMS/PredictionServer.pm: Use prediction_module to tell prediction modules apart instead of prediction_module/custom_integer_1 combinations. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4562 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/PredictionServer.pm | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 31b140b27c..8ab78d43c6 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2011-07-14 Ramon Novoa + + * lib/PandoraFMS/PredictionServer.pm: Use prediction_module to tell + prediction modules apart instead of prediction_module/custom_integer_1 + combinations. + 2011-07-13 Ramon Novoa * lib/PandoraFMS/PredictionServer.pm: Added support for synthetic diff --git a/pandora_server/lib/PandoraFMS/PredictionServer.pm b/pandora_server/lib/PandoraFMS/PredictionServer.pm index 428eee8c18..09dc30fdfb 100644 --- a/pandora_server/lib/PandoraFMS/PredictionServer.pm +++ b/pandora_server/lib/PandoraFMS/PredictionServer.pm @@ -140,14 +140,14 @@ sub exec_prediction_module ($$$$) { return unless defined $agent_module; # Service modules - if ($agent_module->{'custom_integer_1'} != 0) { + if ($agent_module->{'prediction_module'} == 2) { logger ($pa_config, "Executing service module " . $agent_module->{'nombre'}, 10); enterprise_hook ('exec_service_module', [$pa_config, $agent_module, $server_id, $dbh]); return; } # Synthetic modules - if ($agent_module->{'prediction_module'} == 0) { + if ($agent_module->{'prediction_module'} == 3) { logger ($pa_config, "Executing synthetic module " . $agent_module->{'nombre'}, 10); enterprise_hook ('exec_synthetic_module', [$pa_config, $agent_module, $server_id, $dbh]); return;