tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-24 10:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5350-Modulos-cron-de-agente-cambian-intervalo' into 'develop'

Browse Source 
Changed logic of inverted interval management

See merge request artica/pandorafms!3074
This commit is contained in:
Daniel Rodriguez 2020-02-28 11:02:13 +01:00
commit 4645ee6ea9
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_agents/unix/pandora_agent
View File

@ -2606,7 +2606,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;
} }
############################################################################### ###############################################################################
@ -2637,7 +2637,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;
@ -2661,15 +2661,11 @@ sub cron_next_execution_date {
} }
} }
# Get current time
if (! defined ($cur_time)) {
$cur_time = time();
}
# Check if current time + interval is on cron too # Check if current time + interval is on cron too
my $nex_time = $cur_time + $interval; my $nex_time = $cur_time + $interval;
my ($cur_min, $cur_hour, $cur_mday, $cur_mon, $cur_year) my ($cur_min, $cur_hour, $cur_mday, $cur_mon, $cur_year)
= (localtime ($nex_time))[1, 2, 3, 4, 5]; = (localtime ($nex_time))[1, 2, 3, 4, 5];
my @cron_array = ($min, $hour, $mday, $mon); my @cron_array = ($min, $hour, $mday, $mon);
my @curr_time_array = ($cur_min, $cur_hour, $cur_mday, $cur_mon); my @curr_time_array = ($cur_min, $cur_hour, $cur_mday, $cur_mon);
return ($nex_time) if cron_is_in_cron(\@cron_array, \@curr_time_array) == 1; return ($nex_time) if cron_is_in_cron(\@cron_array, \@curr_time_array) == 1;
@ -2806,7 +2802,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 returns elem_down.
################################################################################ ################################################################################
sub cron_get_next_time_element { sub cron_get_next_time_element {
# Default floor data is 0 # Default floor data is 0
@ -2814,7 +2810,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;
} }