tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5349-Modulos-con-cron-no-ejecutan-cuando-deben' into 'develop' 

Changed cron functions to allow inverse intervals

See merge request artica/pandorafms!3075
This commit is contained in:
Daniel Rodriguez 2020-02-28 09:39:14 +01:00
parent a6542e32b1 b5c5d631c6
commit 5dff4e572e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -1480,7 +1480,7 @@ sub cron_next_execution {
$nex_time = cron_next_execution_date ($cron, $nex_time, 0); $nex_time = cron_next_execution_date ($cron, $nex_time, 0);
} }
return $nex_time - time(); return $nex_time - $cur_time;
} }
############################################################################### ###############################################################################
# Get the number of seconds left to the next execution of the given cron entry. # Get the number of seconds left to the next execution of the given cron entry.
@ -1510,7 +1510,7 @@ sub cron_check_interval {
if ($down < $up) { if ($down < $up) {
return 0 if ($elem_curr_time < $down || $elem_curr_time > $up); return 0 if ($elem_curr_time < $down || $elem_curr_time > $up);
} else { } else {
return 0 if ($elem_curr_time > $down || $elem_curr_time < $up); return 0 if ($elem_curr_time < $down && $elem_curr_time > $up);
} }
return 1; return 1;
@ -1675,7 +1675,7 @@ sub cron_is_in_cron {
# * should returns floor data. # * should returns floor data.
# 5 should returns 5. # 5 should returns 5.
# 10-55 should returns 10. # 10-55 should returns 10.
# 55-10 should retunrs floor data. # 55-10 should retunrs elem_down.
################################################################################ ################################################################################
sub cron_get_next_time_element { sub cron_get_next_time_element {
# Default floor data is 0 # Default floor data is 0
@ -1683,7 +1683,7 @@ sub cron_get_next_time_element {
$floor_data = 0 unless defined($floor_data); $floor_data = 0 unless defined($floor_data);
my ($elem_down, $elem_up) = cron_get_interval ($curr_element); my ($elem_down, $elem_up) = cron_get_interval ($curr_element);
return ($elem_down eq '*' || (defined($elem_up) && $elem_down > $elem_up)) return ($elem_down eq '*')
? $floor_data ? $floor_data
: $elem_down; : $elem_down;
} }