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

bug fixes

Browse Source
This commit is contained in:
Oliver Gorwits
2017-11-09 21:49:45 +00:00
parent e0c6615c87
commit 98442a2308
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ register 'register_worker' => sub {
my $no = (exists $workerconf->{no} ? $workerconf->{no} : undef);
my $only = (exists $workerconf->{only} ? $workerconf->{only} : undef);
return $job->add_status( Status->defer('worker is not applicable to this device') )
return $job->add_status( Status->noop('worker not applicable to this device') )
if ($no and check_acl_no($job->device, $no))
or ($only and not check_acl_only($job->device, $only));
@@ -54,6 +54,7 @@ register 'register_worker' => sub {
next if exists $stanza->{driver} and exists $workerconf->{driver}
and (($stanza->{driver} || '') ne ($workerconf->{driver} || ''));
# filter here rather than in Runner as runner does not know namespace
next if exists $stanza->{action}
and not _find_matchaction($workerconf, lc($stanza->{action}));
@@ -61,7 +62,7 @@ register 'register_worker' => sub {
}
# per-device action but no device creds available
return $job->add_status( Status->defer('deferred job with no device creds') )
return $job->add_status( Status->noop('worker driver or action not applicable') )
if 0 == scalar @newuserconf;
}