From 1fdb0861834fb6a77e165701f368bf7bb7e2f86f Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 12 Sep 2017 08:12:12 +0100 Subject: [PATCH] refactor to remove second loop --- lib/App/Netdisco/Worker/Runner.pm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/App/Netdisco/Worker/Runner.pm b/lib/App/Netdisco/Worker/Runner.pm index 35da00eb..72989b44 100644 --- a/lib/App/Netdisco/Worker/Runner.pm +++ b/lib/App/Netdisco/Worker/Runner.pm @@ -63,19 +63,12 @@ sub run { my @phase_hooks = grep { m/^nd2_${action}_/ } @{ (setting('_nd2worker_hooks') || []) }; - 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; - } - - foreach my $phase (@phase_hooks) { + foreach my $phase ("nd2_${action}", @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; + return if $stage eq 'init' and $self->jobstat->not_ok; } } }