diff --git a/Netdisco/lib/App/Netdisco/Daemon/Queue.pm b/Netdisco/lib/App/Netdisco/Daemon/Queue.pm index 95cbb30d..7dae68f3 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Queue.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Queue.pm @@ -33,7 +33,7 @@ sub capacity_for { debug "checking local capacity for action $action"; my $action_map = { - Poller => [qw/refresh discover discoverall discover_neighbors/], + Poller => [qw/refresh discover discovernew discover_neighbors/], Interactive => [qw/location contact portcontrol portname vlan power/], }; diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm index 1216b6ad..3a6871d3 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm @@ -14,7 +14,7 @@ my $fqdn = hostfqdn || 'localhost'; my $role_map = { (map {$_ => 'Poller'} - qw/refresh discover discoverall discover_neighbors/), + qw/refresh discover discovernew discover_neighbors/), (map {$_ => 'Interactive'} qw/location contact portcontrol portname vlan power/) }; diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm index e7774a78..8c8e1b6e 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm @@ -53,7 +53,7 @@ sub discover { # run find_neighbors on all known devices, and run discover on any # newly found devices. -sub discoverall { +sub discovernew { my ($self, $job) = @_; my $devices = schema('netdisco')->resultset('Device')->get_column('ip'); diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm index 98eabb43..f7ad185b 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm @@ -11,10 +11,10 @@ use namespace::clean; my $jobactions = { map {$_ => undef} qw/ + refresh + discovernew / # saveconfigs -# discoverall -# refresh # macwalk # arpwalk # nbtwalk diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml index cc13a5ad..d0dd4f90 100644 --- a/Netdisco/share/config.yml +++ b/Netdisco/share/config.yml @@ -80,7 +80,7 @@ daemon_pollers: 2 # what housekeeping tasks should this node *schedule* # (it only does them if daemon_pollers is non-zero) #housekeeping: -# discoverall: +# discovernew: # device: '192.0.2.0' # when: # wday: 'wed'