change stage to phase

This commit is contained in:
Oliver Gorwits
2017-10-07 09:42:41 +01:00
parent 256c10bae5
commit 273cbbc11b
40 changed files with 58 additions and 58 deletions

View File

@@ -9,8 +9,8 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Permission qw/check_acl_no check_acl_only/; use App::Netdisco::Util::Permission qw/check_acl_no check_acl_only/;
my $store = Dancer::Factory::Hook->instance(); my $store = Dancer::Factory::Hook->instance();
foreach my $stage (qw/check early main user/) { foreach my $phase (qw/check early main user/) {
$store->install_hooks("nd2_core_${stage}"); $store->install_hooks("nd2_core_${phase}");
} }
register 'register_worker' => sub { register 'register_worker' => sub {
@@ -21,7 +21,7 @@ register 'register_worker' => sub {
return error "bad param to register_worker" return error "bad param to register_worker"
unless ((ref sub {} eq ref $code) and (ref {} eq ref $workerconf)); unless ((ref sub {} eq ref $code) and (ref {} eq ref $workerconf));
$workerconf->{stage} ||= 'user'; $workerconf->{phase} ||= 'user';
my $worker = sub { my $worker = sub {
my $job = shift or return Status->error('missing job param'); my $job = shift or return Status->error('missing job param');
@@ -60,7 +60,7 @@ register 'register_worker' => sub {
}; };
# D::Factory::Hook::register_hook() does not work?! # D::Factory::Hook::register_hook() does not work?!
my $hook = 'nd2_core_'. $workerconf->{stage}; my $hook = 'nd2_core_'. $workerconf->{phase};
hook $hook => $worker; hook $hook => $worker;
}; };

View File

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

View File

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

View File

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

View File

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

View File

@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP; use App::Netdisco::Transport::SNMP;
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
return Status->error('Missing device (-d).') return Status->error('Missing device (-d).')
unless defined shift->device; unless defined shift->device;
return Status->done('Contact is able to run'); return Status->done('Contact is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $data) = map {$job->$_} qw/device extra/; my ($device, $data) = map {$job->$_} qw/device extra/;

View File

@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Device 'delete_device'; use App::Netdisco::Util::Device 'delete_device';
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
return Status->error('Missing device (-d).') return Status->error('Missing device (-d).')
unless defined shift->device; unless defined shift->device;
return Status->done('Delete is able to run'); return Status->done('Delete is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/; my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
use Dancer::Plugin::DBIC 'schema'; use Dancer::Plugin::DBIC 'schema';
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
return Status->error('Missing device (-d).') return Status->error('Missing device (-d).')
unless defined shift->device; unless defined shift->device;
return Status->done('ExpireNodes is able to run'); return Status->done('ExpireNodes is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {

View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Graph (); use App::Netdisco::Util::Graph ();
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
App::Netdisco::Util::Graph::graph(); App::Netdisco::Util::Graph::graph();
return Status->done('Generated graph data'); return Status->done('Generated graph data');
}); });

View File

@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP; use App::Netdisco::Transport::SNMP;
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
return Status->error('Missing device (-d).') return Status->error('Missing device (-d).')
unless defined shift->device; unless defined shift->device;
return Status->done('Location is able to run'); return Status->done('Location is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $data) = map {$job->$_} qw/device extra/; my ($device, $data) = map {$job->$_} qw/device extra/;

View File

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

View File

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

View File

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

View File

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

View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::NodeMonitor (); use App::Netdisco::Util::NodeMonitor ();
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
App::Netdisco::Util::NodeMonitor::monitor(); App::Netdisco::Util::NodeMonitor::monitor();
return Status->done('Generated monitor data'); return Status->done('Generated monitor data');
}); });

View File

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

View File

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

View File

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

View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP; use App::Netdisco::Transport::SNMP;
use App::Netdisco::Util::Port ':all'; use App::Netdisco::Util::Port ':all';
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->error('Missing device (-d).') unless defined $job->device; return Status->error('Missing device (-d).') unless defined $job->device;
return Status->error('Missing port (-p).') unless defined $job->port; return Status->error('Missing port (-p).') unless defined $job->port;
@@ -24,7 +24,7 @@ register_worker({ stage => 'check' }, sub {
return Status->done('PortControl is able to run'); return Status->done('PortControl is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $pn) = map {$job->$_} qw/device port/; my ($device, $pn) = map {$job->$_} qw/device port/;
my $port = get_port($device, $pn); my $port = get_port($device, $pn);

View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP; use App::Netdisco::Transport::SNMP;
use App::Netdisco::Util::Port ':all'; use App::Netdisco::Util::Port ':all';
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->error('Missing device (-d).') unless defined $job->device; return Status->error('Missing device (-d).') unless defined $job->device;
return Status->error('Missing port (-p).') unless defined $job->port; return Status->error('Missing port (-p).') unless defined $job->port;
@@ -20,7 +20,7 @@ register_worker({ stage => 'check' }, sub {
return Status->done('PortName is able to run'); return Status->done('PortName is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $pn, $data) = map {$job->$_} qw/device port extra/; my ($device, $pn, $data) = map {$job->$_} qw/device port extra/;

View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP; use App::Netdisco::Transport::SNMP;
use App::Netdisco::Util::Port ':all'; use App::Netdisco::Util::Port ':all';
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->error('Missing device (-d).') unless defined $job->device; return Status->error('Missing device (-d).') unless defined $job->device;
return Status->error('Missing port (-p).') unless defined $job->port; return Status->error('Missing port (-p).') unless defined $job->port;
@@ -27,7 +27,7 @@ register_worker({ stage => 'check' }, sub {
return Status->done('Power is able to run'); return Status->done('Power is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $pn) = map {$job->$_} qw/device port/; my ($device, $pn) = map {$job->$_} qw/device port/;
my $port = get_port($device, $pn); my $port = get_port($device, $pn);

View File

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

View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use NetAddr::IP qw/:rfc3021 :lower/; use NetAddr::IP qw/:rfc3021 :lower/;
use App::Netdisco::Util::Device qw/get_device renumber_device/; use App::Netdisco::Util::Device qw/get_device renumber_device/;
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
return Status->error('Missing device (-d).') return Status->error('Missing device (-d).')
unless defined shift->device; unless defined shift->device;
@@ -19,7 +19,7 @@ register_worker({ stage => 'check' }, sub {
return Status->done('Renumber is able to run'); return Status->done('Renumber is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/; my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;

View File

@@ -7,13 +7,13 @@ use aliased 'App::Netdisco::Worker::Status';
use Data::Printer (); use Data::Printer ();
use App::Netdisco::Transport::SNMP; use App::Netdisco::Transport::SNMP;
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
return Status->error('Missing device (-d).') return Status->error('Missing device (-d).')
unless defined shift->device; unless defined shift->device;
return Status->done('Show is able to run'); return Status->done('Show is able to run');
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/; my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;

View File

@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Util::Statistics (); use App::Netdisco::Util::Statistics ();
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
App::Netdisco::Util::Statistics::update_stats(); App::Netdisco::Util::Statistics::update_stats();
return Status->done('Updated statistics'); return Status->done('Updated statistics');
}); });

View File

@@ -4,17 +4,17 @@ use Dancer ':syntax';
use App::Netdisco::Worker::Plugin; use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status'; use aliased 'App::Netdisco::Worker::Status';
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->done('Test (main) ran successfully (1).'); return Status->done('Test (main) ran successfully (1).');
}); });
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->done('Test (check) ran successfully.'); return Status->done('Test (check) ran successfully.');
}); });
register_worker({ stage => 'early' }, sub { register_worker({ phase => 'early' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->error('Test (early) ran successfully.'); return Status->error('Test (early) ran successfully.');
}); });

View File

@@ -4,17 +4,17 @@ use Dancer ':syntax';
use App::Netdisco::Worker::Plugin; use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status'; use aliased 'App::Netdisco::Worker::Status';
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->done('Test (main) ran successfully (2).'); return Status->done('Test (main) ran successfully (2).');
}); });
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->done('Test (check) ran successfully.'); return Status->done('Test (check) ran successfully.');
}); });
register_worker({ stage => 'early' }, sub { register_worker({ phase => 'early' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
return Status->done('Test (early) ran successfully.'); return Status->done('Test (early) ran successfully.');
}); });

View File

@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP; use App::Netdisco::Transport::SNMP;
use App::Netdisco::Util::Port ':all'; use App::Netdisco::Util::Port ':all';
register_worker({ stage => 'check' }, sub { register_worker({ phase => 'check' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $pn, $data) = map {$job->$_} qw/device port extra/; my ($device, $pn, $data) = map {$job->$_} qw/device port extra/;
return Status->error('Missing device (-d).') if !defined $device; return Status->error('Missing device (-d).') if !defined $device;
@@ -28,7 +28,7 @@ register_worker({ stage => 'check' }, sub {
return Status->done("Check phase for update [$pn] vlan $data done."); return Status->done("Check phase for update [$pn] vlan $data done.");
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $pn, $data) = map {$job->$_} qw/device port extra/; my ($device, $pn, $data) = map {$job->$_} qw/device port extra/;
@@ -62,7 +62,7 @@ register_worker({ stage => 'main' }, sub {
return Status->done("Updated [$pn] pvid on [$device] to [$data]"); return Status->done("Updated [$pn] pvid on [$device] to [$data]");
}); });
register_worker({ stage => 'main' }, sub { register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $pn, $data) = map {$job->$_} qw/device port extra/; my ($device, $pn, $data) = map {$job->$_} qw/device port extra/;