From c3caf8084423ef3b1ec19365e20ef61a19b34447 Mon Sep 17 00:00:00 2001 From: ramonn Date: Tue, 14 Sep 2010 10:32:11 +0000 Subject: [PATCH] 2010-09-14 Ramon Novoa * lib/PandoraFMS/Core.pm: Do not execute alerts in stand-by. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3244 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 4 ++++ pandora_server/lib/PandoraFMS/Core.pm | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index c6cffaa6dc..6298307d7b 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2010-09-14 Ramon Novoa + + * lib/PandoraFMS/Core.pm: Do not execute alerts in stand-by. + 2010-09-10 Ramon Novoa * lib/PandoraFMS/NetworkServer.pm, diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index bc83710aed..9c57af0bc2 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -504,7 +504,13 @@ Execute the given alert. sub pandora_execute_alert ($$$$$$$$;$) { my ($pa_config, $data, $agent, $module, $alert, $alert_mode, $dbh, $timestamp, $extra_macros) = @_; - + + # Alerts in stand-by are not executed + if ($alert->{'standby'} == 1) { + logger ($pa_config, "Alert '" . $alert->{'name'} . "' for module '" . $module->{'nombre'} . "' is in stand-by. Not executing.", 10); + return; + } + logger ($pa_config, "Executing alert '" . $alert->{'name'} . "' for module '" . $module->{'nombre'} . "'.", 10); # Get active actions/commands