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

change to init, first, second stages

Browse Source
This commit is contained in:
Oliver Gorwits
2017-09-10 16:09:45 +01:00
parent 5f2da69697
commit 64a9491115
34 changed files with 74 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/App/Netdisco/Worker/Plugin.pm
View File

@@ -28,9 +28,9 @@ register 'register_worker' => sub {
}
else { return error "worker Package does not match standard naming" }
$workerconf->{action} = $action;
$workerconf->{phase} = ($phase || '00init');
$workerconf->{primary} = ($workerconf->{primary} ? true : false);
$workerconf->{action} = $action;
$workerconf->{phase} = ($phase || '');
$workerconf->{stage} = ($workerconf->{stage} || 'second');
my $worker = sub {
my $job = shift or return Status->error('missing job param');
@@ -64,18 +64,16 @@ register 'register_worker' => sub {
return $code->($job, $workerconf);
};
my $primary = ($workerconf->{primary} ? '_primary' : '');
my $hook = 'nd2_'. $action .'_'. $workerconf->{phase} . $primary;
my $store = Dancer::Factory::Hook->instance();
my $hook = 'nd2_'. $action . ($phase ? ('_'. $phase) : '');
if (not $store->hook_is_registered($hook)) {
$store->install_hooks($hook);
# track just the basic phase names which are used
push @{ setting('_nd2worker_hooks') }, $hook
if $workerconf->{phase} ne '00init' and 0 == length($primary);
push @{ setting('_nd2worker_hooks') }, $hook;
}
# D::Factory::Hook::register_hook() does not work?!
$hook = $hook .'_'. $workerconf->{stage};
hook $hook => $worker;
};

2
lib/App/Netdisco/Worker/Plugin/Arpnip.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Device 'is_arpnipable_now';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
View File

@@ -11,7 +11,7 @@ use Dancer::Plugin::DBIC 'schema';
use Time::HiRes 'gettimeofday';
use NetAddr::MAC ();
register_worker({ primary => true, driver => 'snmp' }, sub {
register_worker({ stage => 'init', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
View File

@@ -10,7 +10,7 @@ use Dancer::Plugin::DBIC 'schema';
use NetAddr::IP::Lite ':lower';
use Time::HiRes 'gettimeofday';
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Arpwalk.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my %queued = map {$_ => 1} jq_queued('arpnip');

2
lib/App/Netdisco/Worker/Plugin/Delete.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Device 'delete_device';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
return Status->error('Missing device (-d).') if !defined $device;

2
lib/App/Netdisco/Worker/Plugin/Discover.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Device 'is_discoverable_now';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
View File

@@ -9,7 +9,7 @@ use App::Netdisco::Util::Permission 'check_acl_only';
use App::Netdisco::Util::DNS 'ipv4_from_hostname';
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
View File

@@ -8,7 +8,7 @@ use App::Netdisco::Transport::SNMP ();
use Dancer::Plugin::DBIC 'schema';
use Encode;
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm
View File

@@ -8,7 +8,7 @@ use App::Netdisco::Transport::SNMP ();
use Dancer::Plugin::DBIC 'schema';
use Encode;
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'first', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
View File

@@ -30,7 +30,7 @@ immediately queued (subject to the filtering by the C<discover_*> settings).
=cut
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP ();
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
View File

@@ -12,7 +12,7 @@ use Dancer::Plugin::DBIC 'schema';
use NetAddr::IP::Lite ':lower';
use Encode;
register_worker({ primary => true, driver => 'snmp' }, sub {
register_worker({ stage => 'init', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP ();
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP ();
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => false }, sub {
register_worker({ stage => 'second' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/DiscoverAll.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my %queued = map {$_ => 1} jq_queued('discover');

2
lib/App/Netdisco/Worker/Plugin/Expire.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Util::Statistics 'update_stats';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
if (setting('expire_devices') and setting('expire_devices') > 0) {

2
lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
return Status->error('nbtstat failed: unable to interpret device param')

2
lib/App/Netdisco/Worker/Plugin/Graph.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Graph ();
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
App::Netdisco::Util::Graph::graph();
return Status->done('Generated graph data.');

2
lib/App/Netdisco/Worker/Plugin/Macsuck.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Device 'is_macsuckable_now';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
View File

@@ -14,7 +14,7 @@ use Dancer::Plugin::DBIC 'schema';
use Time::HiRes 'gettimeofday';
use Scope::Guard 'guard';
register_worker({ primary => true, driver => 'snmp' }, sub {
register_worker({ stage => 'init', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
View File

@@ -8,7 +8,7 @@ use App::Netdisco::Transport::SNMP ();
use Dancer::Plugin::DBIC 'schema';
use Time::HiRes 'gettimeofday';
register_worker({ primary => false, driver => 'snmp' }, sub {
register_worker({ stage => 'second', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;

2
lib/App/Netdisco/Worker/Plugin/Macwalk.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my %queued = map {$_ => 1} jq_queued('macsuck');

2
lib/App/Netdisco/Worker/Plugin/Monitor.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::NodeMonitor ();
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
App::Netdisco::Util::NodeMonitor::monitor();
return Status->done('Generated monitor data.');

2
lib/App/Netdisco/Worker/Plugin/Nbtstat.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Device 'is_macsuckable';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
return Status->error('nbtstat failed: unable to interpret device param')

2
lib/App/Netdisco/Worker/Plugin/Nbtstat/Core.pm
View File

@@ -9,7 +9,7 @@ use App::Netdisco::Util::Node 'is_nbtstatable';
use Dancer::Plugin::DBIC 'schema';
use Time::HiRes 'gettimeofday';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my $host = $job->device->ip;

2
lib/App/Netdisco/Worker/Plugin/Nbtwalk.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my %queued = map {$_ => 1} jq_queued('nbtstat');

2
lib/App/Netdisco/Worker/Plugin/Psql.pm
View File

@@ -4,7 +4,7 @@ use Dancer ':syntax';
use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status';
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;

2
lib/App/Netdisco/Worker/Plugin/Renumber.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use NetAddr::IP qw/:rfc3021 :lower/;
use App::Netdisco::Util::Device qw/get_device renumber_device/;
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
return Status->error('Missing device (-d).') if !defined $device;

2
lib/App/Netdisco/Worker/Plugin/Show.pm
View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use Data::Printer ();
use App::Netdisco::Transport::SNMP;
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
return Status->error('Missing device (-d).') if !defined $device;

2
lib/App/Netdisco/Worker/Plugin/Stats.pm
View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Statistics ();
register_worker({ primary => true }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
App::Netdisco::Util::Statistics::update_stats();
return Status->done('Updated statistics.');

24
lib/App/Netdisco/Worker/Plugin/Test.pm
View File

@@ -4,16 +4,28 @@ use Dancer ':syntax';
use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status';
register_worker({ primary => true }, sub {
register_worker({ stage => 'second' }, sub {
my ($job, $workerconf) = @_;
debug 'Test (primary) ran successfully.';
return Status->done('Test (primary) ran successfully.');
debug 'Test (second) ran successfully.';
return Status->done('Test (second) ran successfully.');
});
register_worker({ primary => false }, sub {
register_worker({ stage => 'init' }, sub {
my ($job, $workerconf) = @_;
debug 'Test ran successfully.';
return Status->done('Test ran successfully.');
debug 'Test (init) ran successfully.';
return Status->done('Test (init) ran successfully.');
});
register_worker({ stage => 'first' }, sub {
my ($job, $workerconf) = @_;
debug 'Test (first) ran successfully.';
return Status->done('Test (first) ran successfully.');
});
register_worker(sub {
my ($job, $workerconf) = @_;
debug 'Test (undefined) ran successfully.';
return Status->done('Test (undefined) ran successfully.');
});
true;

37
lib/App/Netdisco/Worker/Runner.pm
View File

@@ -59,32 +59,32 @@ sub run {
my $guard = guard { set(device_auth => \@userconf) };
set(device_auth => \@newuserconf);
my $store = Dancer::Factory::Hook->instance();
my @phase_hooks = grep { m/^nd2_${action}_/ }
@{ (setting('_nd2worker_hooks') || []) };
# run 00init primary
my $store = Dancer::Factory::Hook->instance();
my $initprimary = "nd2_${action}_00init_primary";
if (scalar @{ $store->get_hooks_for($initprimary) }) {
$self->run_workers($initprimary);
return if $self->jobstat->not_ok;
foreach my $stage (qw/init first second/) {
my $hookname = "nd2_${action}_${stage}";
next unless scalar @{ $store->get_hooks_for($hookname) };
$self->run_workers($hookname);
last if $stage eq 'init' and $self->jobstat->not_ok;
}
# run each 00init worker
$self->run_workers("nd2_${action}_00init");
# run primary
$self->run_workers("${_}_primary") for (@phase_hooks);
# run each worker
$self->run_workers($_) for (@phase_hooks);
foreach my $phase (@phase_hooks) {
foreach my $stage (qw/init first second/) {
my $hookname = "${phase}_${stage}";
next unless scalar @{ $store->get_hooks_for($hookname) };
$self->run_workers($hookname);
last if $stage eq 'init' and $self->jobstat->not_ok;
}
}
}
sub run_workers {
my $self = shift;
my $hook = shift or return $self->jobstat->error('missing hook param');
my $store = Dancer::Factory::Hook->instance();
my $primary = ($hook =~ m/_primary$/);
my $init = ($hook =~ m/_init$/);
return unless scalar @{ $store->get_hooks_for($hook) };
debug "running workers for hook: $hook";
@@ -93,11 +93,12 @@ sub run_workers {
try {
my $retval = $worker->($self->job);
# could die or return undef or a scalar or Status or another class
$self->jobstat($retval) if ref $retval eq 'App::Netdisco::Worker::Status';
$self->jobstat($retval)
if $init and ref $retval eq 'App::Netdisco::Worker::Status';
}
catch { $self->jobstat->error($_) };
catch { $self->jobstat->error($_) if $init };
last if $primary and $self->jobstat->is_ok;
last if $init and $self->jobstat->is_ok;
}
}