From a59c23de798c7d2fc3e246c3b00a98c68ff6d325 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 6 Sep 2017 18:27:34 +0100 Subject: [PATCH] make psql worker primary, add hook debug log --- lib/App/Netdisco/Worker/Plugin/Psql.pm | 3 +-- lib/App/Netdisco/Worker/Runner.pm | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/App/Netdisco/Worker/Plugin/Psql.pm b/lib/App/Netdisco/Worker/Plugin/Psql.pm index 8c3be2df..ce4fc4ef 100644 --- a/lib/App/Netdisco/Worker/Plugin/Psql.pm +++ b/lib/App/Netdisco/Worker/Plugin/Psql.pm @@ -2,10 +2,9 @@ package App::Netdisco::Worker::Plugin::Psql; use Dancer ':syntax'; use App::Netdisco::Worker::Plugin; - use aliased 'App::Netdisco::Worker::Status'; -register_worker(sub { +register_worker({ primary => true }, sub { my ($job, $workerconf) = @_; my ($device, $port, $extra) = map {$job->$_} qw/device port extra/; diff --git a/lib/App/Netdisco/Worker/Runner.pm b/lib/App/Netdisco/Worker/Runner.pm index 27d7f2ae..1ce5abb1 100644 --- a/lib/App/Netdisco/Worker/Runner.pm +++ b/lib/App/Netdisco/Worker/Runner.pm @@ -82,9 +82,11 @@ sub run { sub run_workers { my $self = shift; my $hook = shift or return $self->jobstat->error('missing hook param'); - my $primary = ($hook =~ m/_primary$/); my $store = Dancer::Factory::Hook->instance(); - # debug "entering hook $hook"; + my $primary = ($hook =~ m/_primary$/); + + return unless scalar @{ $store->get_hooks_for($hook) }; + debug "running workers for hook: $hook"; foreach my $worker (@{ $store->get_hooks_for($hook) }) { try {