fixes for DefaultSettings

This commit is contained in:
Oliver Gorwits
2014-05-17 19:27:53 +01:00
parent 2c6f0dd0f7
commit 60522fe555
4 changed files with 4 additions and 5 deletions

View File

@@ -5,8 +5,6 @@ use warnings;
use 5.010_000; use 5.010_000;
our $VERSION = '2.027003'; our $VERSION = '2.027003';
use App::Netdisco::Environment;
use App::Netdisco::DefaultSettings; use App::Netdisco::DefaultSettings;
=head1 NAME =head1 NAME

View File

@@ -7,7 +7,7 @@ use namespace::clean;
use Module::Load (); use Module::Load ();
Module::Load::load_remote 'JobQueue' => Module::Load::load_remote 'JobQueue' =>
'App::Netdisco::JobQueue::' . setting('job_queue') => ':all'; 'App::Netdisco::JobQueue::' . setting('workers')->{queue} => ':all';
sub jq_get { shift and JobQueue::jq_get(@_) } sub jq_get { shift and JobQueue::jq_get(@_) }
sub jq_getlocal { shift and JobQueue::jq_getlocal(@_) } sub jq_getlocal { shift and JobQueue::jq_getlocal(@_) }

View File

@@ -1,6 +1,7 @@
package App::Netdisco::DefaultSettings; package App::Netdisco::DefaultSettings;
use Dancer qw/:moose :syntax :script/; use App::Netdisco::Environment;
use Dancer ':script';
# set up database schema config from simple config vars # set up database schema config from simple config vars
if (ref {} eq ref setting('database')) { if (ref {} eq ref setting('database')) {

View File

@@ -4,7 +4,7 @@ use Dancer qw/:moose :syntax :script/;
use Module::Load (); use Module::Load ();
Module::Load::load Module::Load::load
'App::Netdisco::JobQueue::' . setting('job_queue') => ':all'; 'App::Netdisco::JobQueue::' . setting('workers')->{queue} => ':all';
use base 'Exporter'; use base 'Exporter';
our @EXPORT = (); our @EXPORT = ();