tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8631-no-se-disparan-las-alertas-correladas-con-schedule-en-formato-antiguo' into 'develop'

Browse Source 
extra checks before translate

See merge request artica/pandorafms!4722
This commit is contained in:
Daniel Rodriguez 2022-02-25 13:16:49 +00:00
commit d1cc6f6295
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -551,7 +551,11 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
return $status if ($alert->{$DayNames[$wday]} != 1); return $status if ($alert->{$DayNames[$wday]} != 1);
} }
my $schedule = PandoraFMS::Tools::p_decode_json($pa_config, $alert->{'schedule'}); my $schedule;
if (defined($alert->{'schedule'} && $alert->{'schedule'} != '')) {
$schedule = PandoraFMS::Tools::p_decode_json($pa_config, $alert->{'schedule'});
}
if (defined($schedule)) { if (defined($schedule)) {
# New behaviour. # New behaviour.
return $status unless defined($schedule) && ref $schedule eq "HASH"; return $status unless defined($schedule) && ref $schedule eq "HASH";