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

fix only lookup fqdn once

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-28 09:30:27 +01:00
parent 5f58cfbbe5
commit 666e0a593d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/App/Netdisco/JobQueue/PostgreSQL.pm
View File

@@ -38,7 +38,7 @@ sub _getsome {
return () if ((!defined $num_slots) or ($num_slots < 1)); return () if ((!defined $num_slots) or ($num_slots < 1));
return () if ((!defined $where) or (ref {} ne ref $where)); return () if ((!defined $where) or (ref {} ne ref $where));
my $fqdn ||= (hostfqdn || 'localhost'); $fqdn ||= (hostfqdn || 'localhost');
my $jobs = schema('netdisco')->resultset('Admin'); my $jobs = schema('netdisco')->resultset('Admin');
my $rs = $jobs->search({ my $rs = $jobs->search({
@@ -74,7 +74,7 @@ sub jq_getsomep {
} }
sub jq_locked { sub jq_locked {
my $fqdn ||= (hostfqdn || 'localhost'); $fqdn ||= (hostfqdn || 'localhost');
my @returned = (); my @returned = ();
my $rs = schema('netdisco')->resultset('Admin') my $rs = schema('netdisco')->resultset('Admin')
@@ -115,7 +115,7 @@ sub _get_denied_actions {
} }
sub jq_prime_skiplist { sub jq_prime_skiplist {
my $fqdn ||= (hostfqdn || 'localhost'); $fqdn ||= (hostfqdn || 'localhost');
my @devices = schema('netdisco')->resultset('Device')->all; my @devices = schema('netdisco')->resultset('Device')->all;
my $rs = schema('netdisco')->resultset('DeviceSkip'); my $rs = schema('netdisco')->resultset('DeviceSkip');
my %actionset = (); my %actionset = ();
@@ -139,7 +139,7 @@ sub jq_prime_skiplist {
sub jq_lock { sub jq_lock {
my $job = shift; my $job = shift;
my $fqdn ||= (hostfqdn || 'localhost'); $fqdn ||= (hostfqdn || 'localhost');
my $happy = false; my $happy = false;
# need to handle device discovered since backend daemon started # need to handle device discovered since backend daemon started
@@ -188,7 +188,7 @@ sub jq_lock {
sub jq_defer { sub jq_defer {
my $job = shift; my $job = shift;
my $fqdn ||= (hostfqdn || 'localhost'); $fqdn ||= (hostfqdn || 'localhost');
my $happy = false; my $happy = false;
# note this taints all actions on the device. for example if both # note this taints all actions on the device. for example if both