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

shorten hook names

Browse Source
This commit is contained in:
Oliver Gorwits
2017-09-06 18:30:43 +01:00
parent a59c23de79
commit 1f9740c0e2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)) {

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

@@ -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);