135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add config for scheduled tasks

Browse Source
This commit is contained in:
Oliver Gorwits
2013-03-26 22:42:16 +00:00
parent 2f6efcb312
commit 48f779a8d0
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm
View File

@@ -8,7 +8,7 @@ use Role::Tiny;
use namespace::clean; use namespace::clean;
# add dispatch methods for poller tasks # add dispatch methods for poller tasks
with 'App::Netdisco::Daemon::Worker::Poller::Discover'; # with 'App::Netdisco::Daemon::Worker::Poller::Discover';
sub worker_body { sub worker_body {
my $self = shift; my $self = shift;

8
Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm
View File

@@ -31,10 +31,10 @@ sub worker_begin {
my $config = setting('housekeeping')->{$a}; my $config = setting('housekeeping')->{$a};
# accept either single crontab format, or individual time fields # accept either single crontab format, or individual time fields
my $cron = Algorithm::Cron->new(@{ my $cron = Algorithm::Cron->new(%{
ref [] eq ref $config->{when} ref {} eq ref $config->{when}
? $config->{when} ? $config->{when}
: [crontab => $config->{when}]; : {crontab => $config->{when}}
}); });
$jobactions->{$a} = $config; $jobactions->{$a} = $config;
@@ -71,7 +71,7 @@ sub worker_body {
schema('netdisco')->resultset('Admin')->create({ schema('netdisco')->resultset('Admin')->create({
action => $a, action => $a,
device => ($sched->{device} || undef), device => ($sched->{device} || undef),
subaction => ($sched->{extra} || undef), subaction => ($sched->{param} || undef),
status => 'queued', status => 'queued',
}); });
}; };

30
Netdisco/share/config.yml
View File

@@ -70,8 +70,32 @@ portctl_vlans: 1
# sleep time between polls of the database job queue # sleep time between polls of the database job queue
daemon_sleep_time: 5 daemon_sleep_time: 5
# how many daemon processes # how many daemon processes for this node
# NB one worker will always be a Queue Manager
daemon_interactives: 2 daemon_interactives: 2
daemon_pollers: 0 daemon_pollers: 2
# what housekeeping tasks should this node *schedule*
# (it only does them if daemon_pollers is non-zero)
#housekeeping:
# discoverall:
# device: '192.0.2.0'
# when:
# wday: 'wed'
# hour: 14
# backup:
# when:
# hour: 1
# refresh:
# when: '0 9 * * *'
# arpwalk:
# when:
# min: 30
# macwalk:
# when:
# hour: '*/2'
# nbtwalk:
# when:
# hour: '8,13,21'
# saveconfigs:
# param: 61
# when: '0 * * * *'