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

2010-06-30 Ramon Novoa <rnovoa@artica.es> 

* pandora_agent: Improved the module cron to allow intervals and
          multiple runs within an interval.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2944 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2010-06-30 19:13:41 +00:00
parent 4a868db26e
commit 83cc454366
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-30 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Improved the module cron to allow intervals and
multiple runs within an interval.
2010-06-30 Ramon Novoa <rnovoa@artica.es> 2010-06-30 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Call df with -P from the Linux abstraction layer * pandora_agent: Call df with -P from the Linux abstraction layer

26
pandora_agents/unix/pandora_agent
View File

@ -237,7 +237,8 @@ sub read_config (;$) {
'save' => '', 'save' => '',
'actions' => [], 'actions' => [],
'cron' => '', 'cron' => '',
'cron_utimestamp' => 0 'cron_utimestamp' => 0,
'cron_interval' => -1
}; };
} elsif ($line =~ /^\s*module_name\s+(.+)$/) { } elsif ($line =~ /^\s*module_name\s+(.+)$/) {
$module->{'name'} = $1; $module->{'name'} = $1;
@ -297,8 +298,10 @@ sub read_config (;$) {
} elsif ($action =~ /^\s*=~\s+(\S*)\s+(.*)$/) { } elsif ($action =~ /^\s*=~\s+(\S*)\s+(.*)$/) {
push (@{$module->{'conditions'}}, {'operator' => '=~', 'value_1' => $1, 'command' => $2}); push (@{$module->{'conditions'}}, {'operator' => '=~', 'value_1' => $1, 'command' => $2});
} }
} elsif ($line =~ /^\s*module_cron\s+((\*|\d+)\s+(\*|\d+)\s+(\*|\d+)\s+(\*|\d+)\s+(\*|\d+))\s*$/) { } elsif ($line =~ /^\s*module_cron\s+(((\*|(\d+(-\d+){0,1}))\s*){5}).*$/) {
$module->{'cron'} = $1; $module->{'cron'} = $1;
} elsif ($line =~ /^\s*module_cron_interval\s+(\d+).*$/) {
$module->{'cron_interval'} = $1;
} elsif ($line =~ /^\s*module_end\s*$/) { } elsif ($line =~ /^\s*module_end\s*$/) {
next unless ($module->{'name'} ne '') and ($module->{'func'} != 0); next unless ($module->{'name'} ne '') and ($module->{'func'} != 0);
push (@Modules, $module); push (@Modules, $module);
@ -962,12 +965,27 @@ sub check_module_cron ($) {
# Check cron parameters # Check cron parameters
for (my $i = 0; $i < 5; $i++) { for (my $i = 0; $i < 5; $i++) {
return 0 if ($time_params[$i] ne $cron_params[$i] && $cron_params[$i] ne '*');
# Wildcard
next if ($cron_params[$i] eq '*');
# Get interval
my ($bottom, $top) = split (/-/, $cron_params[$i]);
$top = $bottom unless defined ($top);
# Check interval
if ($bottom <= $top) {
return 0 if ($time_params[$i] < $bottom || $time_params[$i] > $top);
} else {
return 0 if ($time_params[$i] < $bottom && $time_params[$i] > $top);
}
} }
# Do not check in the next minute, hour, day or month. # Do not check in the next minute, hour, day or month.
my $offset = 0; my $offset = 0;
if($cron_params[0] ne '*') { if ($module->{'cron_interval'} >= 0) {
$offset = $module->{'cron_interval'};
} elsif($cron_params[0] ne '*') {
# 1 minute # 1 minute
$offset = 60; $offset = 60;
} elsif($cron_params[1] ne '*') { } elsif($cron_params[1] ne '*') {