From 273cbbc11b1d1cd1291b775aa3ea0575b519035a Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 7 Oct 2017 09:42:41 +0100
Subject: [PATCH] change stage to phase

---
 lib/App/Netdisco/Worker/Plugin.pm                       | 8 ++++----
 lib/App/Netdisco/Worker/Plugin/Arpnip.pm                | 2 +-
 lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm          | 2 +-
 lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm        | 2 +-
 lib/App/Netdisco/Worker/Plugin/Arpwalk.pm               | 2 +-
 lib/App/Netdisco/Worker/Plugin/Contact.pm               | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Delete.pm                | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Discover.pm              | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm  | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm     | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm   | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm    | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm    | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm   | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm        | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm     | 2 +-
 lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm    | 2 +-
 lib/App/Netdisco/Worker/Plugin/DiscoverAll.pm           | 2 +-
 lib/App/Netdisco/Worker/Plugin/Expire.pm                | 2 +-
 lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm           | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Graph.pm                 | 2 +-
 lib/App/Netdisco/Worker/Plugin/Location.pm              | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Macsuck.pm               | 2 +-
 lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm         | 2 +-
 lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm | 2 +-
 lib/App/Netdisco/Worker/Plugin/Macwalk.pm               | 2 +-
 lib/App/Netdisco/Worker/Plugin/Monitor.pm               | 2 +-
 lib/App/Netdisco/Worker/Plugin/Nbtstat.pm               | 2 +-
 lib/App/Netdisco/Worker/Plugin/Nbtstat/Core.pm          | 2 +-
 lib/App/Netdisco/Worker/Plugin/Nbtwalk.pm               | 2 +-
 lib/App/Netdisco/Worker/Plugin/PortControl.pm           | 4 ++--
 lib/App/Netdisco/Worker/Plugin/PortName.pm              | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Power.pm                 | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Psql.pm                  | 2 +-
 lib/App/Netdisco/Worker/Plugin/Renumber.pm              | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Show.pm                  | 4 ++--
 lib/App/Netdisco/Worker/Plugin/Stats.pm                 | 2 +-
 lib/App/Netdisco/Worker/Plugin/Test.pm                  | 6 +++---
 lib/App/Netdisco/Worker/Plugin/Test/Core.pm             | 6 +++---
 lib/App/Netdisco/Worker/Plugin/Vlan.pm                  | 6 +++---
 40 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/lib/App/Netdisco/Worker/Plugin.pm b/lib/App/Netdisco/Worker/Plugin.pm
index 782f2382..6424f2ed 100644
--- a/lib/App/Netdisco/Worker/Plugin.pm
+++ b/lib/App/Netdisco/Worker/Plugin.pm
@@ -9,8 +9,8 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Util::Permission qw/check_acl_no check_acl_only/;
 
 my $store = Dancer::Factory::Hook->instance();
-foreach my $stage (qw/check early main user/) {
-  $store->install_hooks("nd2_core_${stage}");
+foreach my $phase (qw/check early main user/) {
+  $store->install_hooks("nd2_core_${phase}");
 }
 
 register 'register_worker' => sub {
@@ -21,7 +21,7 @@ register 'register_worker' => sub {
   return error "bad param to register_worker"
     unless ((ref sub {} eq ref $code) and (ref {} eq ref $workerconf));
 
-  $workerconf->{stage} ||= 'user';
+  $workerconf->{phase} ||= 'user';
 
   my $worker = sub {
     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?!
-  my $hook = 'nd2_core_'. $workerconf->{stage};
+  my $hook = 'nd2_core_'. $workerconf->{phase};
   hook $hook => $worker;
 };
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm
index 6be5a805..1d79f128 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::Device 'is_arpnipable_now';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   my $device = $job->device;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
index 4592378e..4c5e82a4 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
@@ -11,7 +11,7 @@ use Dancer::Plugin::DBIC 'schema';
 use Time::HiRes 'gettimeofday';
 use NetAddr::MAC ();
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
index 91a03f6b..5511c267 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
@@ -10,7 +10,7 @@ use Dancer::Plugin::DBIC 'schema';
 use NetAddr::IP::Lite ':lower';
 use Time::HiRes 'gettimeofday';
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpwalk.pm b/lib/App/Netdisco/Worker/Plugin/Arpwalk.pm
index 85d3ae5c..599aba4c 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpwalk.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpwalk.pm
@@ -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({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
 
   my %queued = map {$_ => 1} jq_queued('arpnip');
diff --git a/lib/App/Netdisco/Worker/Plugin/Contact.pm b/lib/App/Netdisco/Worker/Plugin/Contact.pm
index cc82e204..7ee07ac2 100644
--- a/lib/App/Netdisco/Worker/Plugin/Contact.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Contact.pm
@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Transport::SNMP;
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   return Status->error('Missing device (-d).')
     unless defined shift->device;
   return Status->done('Contact is able to run');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $data) = map {$job->$_} qw/device extra/;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Delete.pm b/lib/App/Netdisco/Worker/Plugin/Delete.pm
index 3aa2c980..8ecb61ca 100644
--- a/lib/App/Netdisco/Worker/Plugin/Delete.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Delete.pm
@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::Device 'delete_device';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   return Status->error('Missing device (-d).')
     unless defined shift->device;
   return Status->done('Delete is able to run');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover.pm b/lib/App/Netdisco/Worker/Plugin/Discover.pm
index a806deda..96c4dc05 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::Device 'is_discoverable_now';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   my $device = $job->device;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm b/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
index c07af5ae..48be3949 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
@@ -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({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
index 2be07c15..a7a5de68 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
@@ -8,7 +8,7 @@ use App::Netdisco::Transport::SNMP ();
 use Dancer::Plugin::DBIC 'schema';
 use Encode;
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm
index a9d05ad7..4d25dae8 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm
@@ -8,7 +8,7 @@ use App::Netdisco::Transport::SNMP ();
 use Dancer::Plugin::DBIC 'schema';
 use Encode;
 
-register_worker({ stage => 'early', driver => 'snmp' }, sub {
+register_worker({ phase => 'early', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
index 997037bb..7158ca63 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
@@ -30,7 +30,7 @@ immediately queued (subject to the filtering by the C<discover_*> settings).
 
 =cut
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm b/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
index 8e14d852..9e00de70 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Transport::SNMP ();
 use Dancer::Plugin::DBIC 'schema';
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
index 5823332c..487724d6 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
@@ -12,7 +12,7 @@ use Dancer::Plugin::DBIC 'schema';
 use NetAddr::IP::Lite ':lower';
 use Encode;
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm b/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
index 652c4cf9..13db7b2c 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Transport::SNMP ();
 use Dancer::Plugin::DBIC 'schema';
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
index d0056d6f..699718e7 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Transport::SNMP ();
 use Dancer::Plugin::DBIC 'schema';
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm b/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
index 650a2793..cbdc2a05 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use Dancer::Plugin::DBIC 'schema';
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my $device = $job->device;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/DiscoverAll.pm b/lib/App/Netdisco/Worker/Plugin/DiscoverAll.pm
index 93eefe1d..3bace148 100644
--- a/lib/App/Netdisco/Worker/Plugin/DiscoverAll.pm
+++ b/lib/App/Netdisco/Worker/Plugin/DiscoverAll.pm
@@ -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({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
 
   my %queued = map {$_ => 1} jq_queued('discover');
diff --git a/lib/App/Netdisco/Worker/Plugin/Expire.pm b/lib/App/Netdisco/Worker/Plugin/Expire.pm
index 66e81877..28c93cc4 100644
--- a/lib/App/Netdisco/Worker/Plugin/Expire.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Expire.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use Dancer::Plugin::DBIC 'schema';
 use App::Netdisco::Util::Statistics 'update_stats';
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
 
   if (setting('expire_devices') and setting('expire_devices') > 0) {
diff --git a/lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm b/lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm
index d964aa62..01bb565c 100644
--- a/lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm
@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use Dancer::Plugin::DBIC 'schema';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   return Status->error('Missing device (-d).')
     unless defined shift->device;
   return Status->done('ExpireNodes is able to run');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
 
   schema('netdisco')->txn_do(sub {
diff --git a/lib/App/Netdisco/Worker/Plugin/Graph.pm b/lib/App/Netdisco/Worker/Plugin/Graph.pm
index 1d6217db..0629890f 100644
--- a/lib/App/Netdisco/Worker/Plugin/Graph.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Graph.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::Graph ();
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   App::Netdisco::Util::Graph::graph();
   return Status->done('Generated graph data');
 });
diff --git a/lib/App/Netdisco/Worker/Plugin/Location.pm b/lib/App/Netdisco/Worker/Plugin/Location.pm
index c7c7f45a..6bd14762 100644
--- a/lib/App/Netdisco/Worker/Plugin/Location.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Location.pm
@@ -6,13 +6,13 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Transport::SNMP;
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   return Status->error('Missing device (-d).')
     unless defined shift->device;
   return Status->done('Location is able to run');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $data) = map {$job->$_} qw/device extra/;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm
index 2ab3da7d..a051329e 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::Device 'is_macsuckable_now';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   my $device = $job->device;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
index 3f73ca27..2a01d7e9 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
@@ -14,7 +14,7 @@ use Dancer::Plugin::DBIC 'schema';
 use Time::HiRes 'gettimeofday';
 use Scope::Guard 'guard';
 
-register_worker({ stage => 'check', driver => 'snmp' }, sub {
+register_worker({ phase => 'check', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
index 5a7e9c5a..2a711e5a 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
@@ -8,7 +8,7 @@ use App::Netdisco::Transport::SNMP ();
 use Dancer::Plugin::DBIC 'schema';
 use Time::HiRes 'gettimeofday';
 
-register_worker({ stage => 'main', driver => 'snmp' }, sub {
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
   my ($job, $workerconf) = @_;
 
   my $device = $job->device;
diff --git a/lib/App/Netdisco/Worker/Plugin/Macwalk.pm b/lib/App/Netdisco/Worker/Plugin/Macwalk.pm
index d09bc0e7..01d49b85 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macwalk.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macwalk.pm
@@ -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({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
 
   my %queued = map {$_ => 1} jq_queued('macsuck');
diff --git a/lib/App/Netdisco/Worker/Plugin/Monitor.pm b/lib/App/Netdisco/Worker/Plugin/Monitor.pm
index 15fa4168..2cf41af0 100644
--- a/lib/App/Netdisco/Worker/Plugin/Monitor.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Monitor.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::NodeMonitor ();
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   App::Netdisco::Util::NodeMonitor::monitor();
   return Status->done('Generated monitor data');
 });
diff --git a/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm b/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm
index bc933107..cff91e92 100644
--- a/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::Device 'is_macsuckable';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
 
   return Status->error('nbtstat failed: unable to interpret device param')
diff --git a/lib/App/Netdisco/Worker/Plugin/Nbtstat/Core.pm b/lib/App/Netdisco/Worker/Plugin/Nbtstat/Core.pm
index 1db6421e..f50f31d7 100644
--- a/lib/App/Netdisco/Worker/Plugin/Nbtstat/Core.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Nbtstat/Core.pm
@@ -9,7 +9,7 @@ use App::Netdisco::Util::Node 'is_nbtstatable';
 use Dancer::Plugin::DBIC 'schema';
 use Time::HiRes 'gettimeofday';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   my $host = $job->device->ip;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Nbtwalk.pm b/lib/App/Netdisco/Worker/Plugin/Nbtwalk.pm
index be17e802..72d0c26f 100644
--- a/lib/App/Netdisco/Worker/Plugin/Nbtwalk.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Nbtwalk.pm
@@ -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({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
 
   my %queued = map {$_ => 1} jq_queued('nbtstat');
diff --git a/lib/App/Netdisco/Worker/Plugin/PortControl.pm b/lib/App/Netdisco/Worker/Plugin/PortControl.pm
index 286bd105..66ff7580 100644
--- a/lib/App/Netdisco/Worker/Plugin/PortControl.pm
+++ b/lib/App/Netdisco/Worker/Plugin/PortControl.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Transport::SNMP;
 use App::Netdisco::Util::Port ':all';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   return Status->error('Missing device (-d).') unless defined $job->device;
   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');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $pn) = map {$job->$_} qw/device port/;
   my $port = get_port($device, $pn);
diff --git a/lib/App/Netdisco/Worker/Plugin/PortName.pm b/lib/App/Netdisco/Worker/Plugin/PortName.pm
index 188afc0a..3f90d5e9 100644
--- a/lib/App/Netdisco/Worker/Plugin/PortName.pm
+++ b/lib/App/Netdisco/Worker/Plugin/PortName.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Transport::SNMP;
 use App::Netdisco::Util::Port ':all';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   return Status->error('Missing device (-d).') unless defined $job->device;
   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');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $pn, $data) = map {$job->$_} qw/device port extra/;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Power.pm b/lib/App/Netdisco/Worker/Plugin/Power.pm
index 32fc130e..86cd364b 100644
--- a/lib/App/Netdisco/Worker/Plugin/Power.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Power.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Transport::SNMP;
 use App::Netdisco::Util::Port ':all';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   return Status->error('Missing device (-d).') unless defined $job->device;
   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');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $pn) = map {$job->$_} qw/device port/;
   my $port = get_port($device, $pn);
diff --git a/lib/App/Netdisco/Worker/Plugin/Psql.pm b/lib/App/Netdisco/Worker/Plugin/Psql.pm
index 099fbb9b..b47f3823 100644
--- a/lib/App/Netdisco/Worker/Plugin/Psql.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Psql.pm
@@ -4,7 +4,7 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Renumber.pm b/lib/App/Netdisco/Worker/Plugin/Renumber.pm
index 3dad0a8d..47d59d24 100644
--- a/lib/App/Netdisco/Worker/Plugin/Renumber.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Renumber.pm
@@ -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({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   return Status->error('Missing device (-d).')
     unless defined shift->device;
 
@@ -19,7 +19,7 @@ register_worker({ stage => 'check' }, sub {
   return Status->done('Renumber is able to run');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Show.pm b/lib/App/Netdisco/Worker/Plugin/Show.pm
index 3ad2d942..b81b00ea 100644
--- a/lib/App/Netdisco/Worker/Plugin/Show.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Show.pm
@@ -7,13 +7,13 @@ use aliased 'App::Netdisco::Worker::Status';
 use Data::Printer ();
 use App::Netdisco::Transport::SNMP;
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   return Status->error('Missing device (-d).')
     unless defined shift->device;
   return Status->done('Show is able to run');
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Stats.pm b/lib/App/Netdisco/Worker/Plugin/Stats.pm
index 1d2b0b41..7c0d6e99 100644
--- a/lib/App/Netdisco/Worker/Plugin/Stats.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Stats.pm
@@ -6,7 +6,7 @@ use aliased 'App::Netdisco::Worker::Status';
 
 use App::Netdisco::Util::Statistics ();
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   App::Netdisco::Util::Statistics::update_stats();
   return Status->done('Updated statistics');
 });
diff --git a/lib/App/Netdisco/Worker/Plugin/Test.pm b/lib/App/Netdisco/Worker/Plugin/Test.pm
index 6e1ba77d..75ba809a 100644
--- a/lib/App/Netdisco/Worker/Plugin/Test.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Test.pm
@@ -4,17 +4,17 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   return Status->done('Test (main) ran successfully (1).');
 });
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   return Status->done('Test (check) ran successfully.');
 });
 
-register_worker({ stage => 'early' }, sub {
+register_worker({ phase => 'early' }, sub {
   my ($job, $workerconf) = @_;
   return Status->error('Test (early) ran successfully.');
 });
diff --git a/lib/App/Netdisco/Worker/Plugin/Test/Core.pm b/lib/App/Netdisco/Worker/Plugin/Test/Core.pm
index 1f929d8e..e64fb280 100644
--- a/lib/App/Netdisco/Worker/Plugin/Test/Core.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Test/Core.pm
@@ -4,17 +4,17 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   return Status->done('Test (main) ran successfully (2).');
 });
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   return Status->done('Test (check) ran successfully.');
 });
 
-register_worker({ stage => 'early' }, sub {
+register_worker({ phase => 'early' }, sub {
   my ($job, $workerconf) = @_;
   return Status->done('Test (early) ran successfully.');
 });
diff --git a/lib/App/Netdisco/Worker/Plugin/Vlan.pm b/lib/App/Netdisco/Worker/Plugin/Vlan.pm
index 6c69f0b2..52cf4bfb 100644
--- a/lib/App/Netdisco/Worker/Plugin/Vlan.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Vlan.pm
@@ -7,7 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
 use App::Netdisco::Transport::SNMP;
 use App::Netdisco::Util::Port ':all';
 
-register_worker({ stage => 'check' }, sub {
+register_worker({ phase => 'check' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $pn, $data) = map {$job->$_} qw/device port extra/;
   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.");
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   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]");
 });
 
-register_worker({ stage => 'main' }, sub {
+register_worker({ phase => 'main' }, sub {
   my ($job, $workerconf) = @_;
   my ($device, $pn, $data) = map {$job->$_} qw/device port extra/;