From 1f9740c0e20858896fa47aa038de1d6403ec1875 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 6 Sep 2017 18:30:43 +0100 Subject: [PATCH] shorten hook names --- lib/App/Netdisco/Worker/Plugin.pm | 2 +- lib/App/Netdisco/Worker/Runner.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/App/Netdisco/Worker/Plugin.pm b/lib/App/Netdisco/Worker/Plugin.pm index 5ec13b7c..149d70bf 100644 --- a/lib/App/Netdisco/Worker/Plugin.pm +++ b/lib/App/Netdisco/Worker/Plugin.pm @@ -65,7 +65,7 @@ register 'register_worker' => sub { }; my $primary = ($workerconf->{primary} ? '_primary' : ''); - my $hook = 'nd2worker_'. $action .'_'. $workerconf->{phase} . $primary; + my $hook = 'nd2_'. $action .'_'. $workerconf->{phase} . $primary; my $store = Dancer::Factory::Hook->instance(); if (not $store->hook_is_registered($hook)) { diff --git a/lib/App/Netdisco/Worker/Runner.pm b/lib/App/Netdisco/Worker/Runner.pm index 1ce5abb1..7d001450 100644 --- a/lib/App/Netdisco/Worker/Runner.pm +++ b/lib/App/Netdisco/Worker/Runner.pm @@ -58,19 +58,19 @@ sub run { set(device_auth => \@newuserconf); my $action = $job->action; - my @phase_hooks = grep { m/^nd2worker_${action}_/ } + my @phase_hooks = grep { m/^nd2_${action}_/ } @{ (setting('_nd2worker_hooks') || []) }; # run 00init primary my $store = Dancer::Factory::Hook->instance(); - my $initprimary = "nd2worker_${action}_00init_primary"; + my $initprimary = "nd2_${action}_00init_primary"; if (scalar @{ $store->get_hooks_for($initprimary) }) { $self->run_workers($initprimary); return if $self->jobstat->not_ok; } # run each 00init worker - $self->run_workers("nd2worker_${action}_00init"); + $self->run_workers("nd2_${action}_00init"); # run primary $self->run_workers("${_}_primary") for (@phase_hooks);