From c8e5cea4ed6f94b86b4bcf28e801d899ba517991 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 5 Sep 2017 20:37:13 +0100
Subject: [PATCH] objectify the running

---
 lib/App/Netdisco/Worker/Runner.pm | 80 +++++++++++++++----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/lib/App/Netdisco/Worker/Runner.pm b/lib/App/Netdisco/Worker/Runner.pm
index 86b19d7c..fa78e922 100644
--- a/lib/App/Netdisco/Worker/Runner.pm
+++ b/lib/App/Netdisco/Worker/Runner.pm
@@ -7,93 +7,93 @@ use App::Netdisco::Worker;
 use aliased 'App::Netdisco::Worker::Status';
 
 use Try::Tiny;
-use Role::Tiny;
+use Moo::Role;
+use Scope::Guard 'guard';
 use namespace::clean;
 
+has 'job' => (
+  is => 'rw',
+);
+
+has 'jobstat' => (
+  is => 'rw',
+  default => sub { Status->error("no worker was successful") },
+);
+
+after 'run', 'run_workers' => sub {
+  my $self = shift;
+  $self->jobstat->update_job($self->job);
+};
+
 # mixin code to run workers loaded via plugins
 sub run {
-  my ($self, $job) = @_;
-  die 'bad job to run()' unless ref $job eq 'App::Netdisco::Backend::Job';
+  my $self = shift;
+
+  $self->job(shift) if scalar @_;
+  die 'bad job to run()'
+    unless ref $self->job eq 'App::Netdisco::Backend::Job';
 
   my @newuserconf = ();
   my @userconf = @{ setting('device_auth') || [] };
 
   # reduce device_auth by only/no
-  if (ref $job->device) {
+  if (ref $self->job->device) {
     foreach my $stanza (@userconf) {
       my $no   = (exists $stanza->{no}   ? $stanza->{no}   : undef);
       my $only = (exists $stanza->{only} ? $stanza->{only} : undef);
 
-      next if $no and check_acl_no($job->device->ip, $no);
-      next if $only and not check_acl_only($job->device->ip, $only);
+      next if $no and check_acl_no($self->job->device->ip, $no);
+      next if $only and not check_acl_only($self->job->device->ip, $only);
 
       push @newuserconf, $stanza;
     }
   }
 
   # per-device action but no device creds available
-  return Status->error('skipped with no device creds')
-    if ref $job->device and 0 == scalar @newuserconf;
+  return $self->jobstat->error('skipped with no device creds')
+    if ref $self->job->device and 0 == scalar @newuserconf;
 
   # back up and restore device_auth
   my $guard = guard { set(device_auth => \@userconf) };
   set(device_auth => \@newuserconf);
 
-  my $action = $job->action;
+  my $action = $self->job->action;
   my @phase_hooks = grep { m/^nd2worker_${action}_/ }
                          @{ (setting('_nd2worker_hooks') || []) };
 
   # run 00init primary
-  my $status = _run_first("nd2worker_${action}_00init_primary", $job);
-  return $status if $status->not_ok;
+  $self->run_workers("nd2worker_${action}_00init_primary");
+  return $self->jobstat if $self->jobstat->not_ok;
 
   # run each 00init worker
-  _run_all("nd2worker_${action}_00init", $job);
+  $self->run_workers("nd2worker_${action}_00init");
 
   # run primary
-  _run_first($_.'_primary', $job) for (@phase_hooks);
+  $self->run_workers("${_}_primary") for (@phase_hooks);
 
   # run each worker
-  _run_all($_, $job) for (@phase_hooks);
+  $self->run_workers($_) for (@phase_hooks);
 
-  return true;
+  return $self->jobstat;
 }
 
-sub _run_first {
-  my $hook = shift or return Status->error('missing hook param');
-  my $job  = shift or return Status->error('missing job param');
+sub run_workers {
+  my $self = shift;
+  my $hook = shift or return $self->jobstat->error('missing hook param');
 
   my $store = Dancer::Factory::Hook->instance();
   $store->hook_is_registered($hook)
     or return Status->error("no such hook: $hook");
 
-  # track returned status of the workers
-  my $best = Status->error("no primary worker at $hook was successful");
-
   foreach my $worker (@{ $store->get_hooks_for($hook) }) {
     try {
-      my $retval = $worker->($job);
+      my $retval = $worker->($self->job);
       # could die or return undef or a scalar or Status or another class
-      $best = $retval if ref $retval eq 'App::Netdisco::Worker::Status';
+      $self->jobstat($retval) if ref $retval eq 'App::Netdisco::Worker::Status';
     }
-    catch { $best->log($_) };
+    catch { $self->jobstat->log($_) };
 
-    last if $best->is_ok;
-  }
-
-  return $best;
-}
-
-sub _run_all {
-  my $hook = shift or return Status->error('missing hook param');
-  my $job  = shift or return Status->error('missing job param');
-
-  my $store = Dancer::Factory::Hook->instance();
-  $store->hook_is_registered($hook)
-    or return Status->error("no such hook: $hook");
-
-  foreach my $worker (@{ $store->get_hooks_for($hook) }) {
-    try { $worker->($job) };
+    last if $hook =~ m/_primary$/ and $self->jobstat->is_ok;
   }
 }