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

establish "artificial" settings all caps convention

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-24 11:18:15 +01:00
parent 7dddf743e5
commit 818f268786
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/netdisco-backend-fg
View File

@@ -29,7 +29,7 @@ BEGIN {
# this can take a few seconds - only do it once # this can take a few seconds - only do it once
use Net::Domain 'hostfqdn'; use Net::Domain 'hostfqdn';
info 'resolving backend hostname...'; info 'resolving backend hostname...';
setting('workers')->{'backend'} ||= (hostfqdn || 'fqdn-undefined'); setting('workers')->{'BACKEND'} ||= (hostfqdn || 'fqdn-undefined');
} }
use App::Netdisco::Util::Backend; use App::Netdisco::Util::Backend;

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

@@ -37,7 +37,7 @@ sub _getsome {
my $rs = $jobs->search({ my $rs = $jobs->search({
status => 'queued', status => 'queued',
device => { '-not_in' => device => { '-not_in' =>
$jobs->skipped(setting('workers')->{'backend'}, $jobs->skipped(setting('workers')->{'BACKEND'},
setting('workers')->{'max_deferrals'}, setting('workers')->{'max_deferrals'},
setting('workers')->{'retry_after'}) setting('workers')->{'retry_after'})
->columns('device')->as_query }, ->columns('device')->as_query },
@@ -71,7 +71,7 @@ sub jq_getsomep {
sub jq_locked { sub jq_locked {
my @returned = (); my @returned = ();
my $rs = schema('netdisco')->resultset('Admin') my $rs = schema('netdisco')->resultset('Admin')
->search({ status => ('queued-'. setting('workers')->{'backend'}) }); ->search({ status => ('queued-'. setting('workers')->{'BACKEND'}) });
while (my $job = $rs->next) { while (my $job = $rs->next) {
push @returned, App::Netdisco::Backend::Job->new({ $job->get_columns }); push @returned, App::Netdisco::Backend::Job->new({ $job->get_columns });
@@ -119,10 +119,10 @@ sub jq_warm_thrusters {
} }
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
$rs->search({ backend => setting('workers')->{'backend'} })->delete; $rs->search({ backend => setting('workers')->{'BACKEND'} })->delete;
$rs->populate([ $rs->populate([
map {{ map {{
backend => setting('workers')->{'backend'}, backend => setting('workers')->{'BACKEND'},
device => $_, device => $_,
actionset => $actionset{$_}, actionset => $actionset{$_},
}} keys %actionset }} keys %actionset
@@ -142,7 +142,7 @@ sub jq_lock {
my @badactions = _get_denied_actions($job->device); my @badactions = _get_denied_actions($job->device);
if (scalar @badactions) { if (scalar @badactions) {
schema('netdisco')->resultset('DeviceSkip')->find_or_create({ schema('netdisco')->resultset('DeviceSkip')->find_or_create({
backend => setting('workers')->{'backend'}, device => $job->device, backend => setting('workers')->{'BACKEND'}, device => $job->device,
},{ key => 'device_skip_pkey' })->add_to_actionset(@badactions); },{ key => 'device_skip_pkey' })->add_to_actionset(@badactions);
return false if scalar grep {$_ eq $job->action} @badactions; return false if scalar grep {$_ eq $job->action} @badactions;
@@ -154,12 +154,12 @@ sub jq_lock {
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
schema('netdisco')->resultset('Admin') schema('netdisco')->resultset('Admin')
->search({ job => $job->job }, { for => 'update' }) ->search({ job => $job->job }, { for => 'update' })
->update({ status => ('queued-'. setting('workers')->{'backend'}) }); ->update({ status => ('queued-'. setting('workers')->{'BACKEND'}) });
return unless return unless
schema('netdisco')->resultset('Admin') schema('netdisco')->resultset('Admin')
->count({ job => $job->job, ->count({ job => $job->job,
status => ('queued-'. setting('workers')->{'backend'}) }); status => ('queued-'. setting('workers')->{'BACKEND'}) });
# remove any duplicate jobs, needed because we have race conditions # remove any duplicate jobs, needed because we have race conditions
# when queueing jobs of a type for all devices # when queueing jobs of a type for all devices
@@ -196,7 +196,7 @@ sub jq_defer {
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
if ($job->device) { if ($job->device) {
schema('netdisco')->resultset('DeviceSkip')->find_or_create({ schema('netdisco')->resultset('DeviceSkip')->find_or_create({
backend => setting('workers')->{'backend'}, device => $job->device, backend => setting('workers')->{'BACKEND'}, device => $job->device,
},{ key => 'device_skip_pkey' })->increment_deferrals; },{ key => 'device_skip_pkey' })->increment_deferrals;
} }
@@ -228,7 +228,7 @@ sub jq_complete {
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
if ($job->device) { if ($job->device) {
schema('netdisco')->resultset('DeviceSkip')->find_or_create({ schema('netdisco')->resultset('DeviceSkip')->find_or_create({
backend => setting('workers')->{'backend'}, device => $job->device, backend => setting('workers')->{'BACKEND'}, device => $job->device,
},{ key => 'device_skip_pkey' })->update({ deferrals => 0 }); },{ key => 'device_skip_pkey' })->update({ deferrals => 0 });
} }