From c9afbab26b80e85a373330c5c3f1a3297b7f6b00 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 10 May 2014 21:36:01 +0100 Subject: [PATCH] use Module::Load tricks to avoid some other mess --- Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm | 20 +++++++++---------- .../Netdisco/Daemon/JobQueue/PostgreSQL.pm | 16 --------------- 2 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 Netdisco/lib/App/Netdisco/Daemon/JobQueue/PostgreSQL.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm b/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm index f460cb0d..db48aa05 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm @@ -5,16 +5,16 @@ use Dancer qw/:moose :syntax :script/; use Role::Tiny; use namespace::clean; -with 'App::Netdisco::Daemon::JobQueue::'. setting('job_queue'); +use Module::Load (); +Module::Load::load_remote 'JobQueue' => + 'App::Netdisco::JobQueue::' . setting('job_queue') => ':all'; -requires qw/ - jq_get - jq_getlocal - jq_queued - jq_lock - jq_defer - jq_complete - jq_insert -/; +sub jq_get { shift and JobQueue::jq_get(@_) } +sub jq_getlocal { shift and JobQueue::jq_getlocal(@_) } +sub jq_queued { shift and JobQueue::jq_queued(@_) } +sub jq_lock { shift and JobQueue::jq_lock(@_) } +sub jq_defer { shift and JobQueue::jq_defer(@_) } +sub jq_complete { shift and JobQueue::jq_complete(@_) } +sub jq_insert { shift and JobQueue::jq_insert(@_) } true; diff --git a/Netdisco/lib/App/Netdisco/Daemon/JobQueue/PostgreSQL.pm b/Netdisco/lib/App/Netdisco/Daemon/JobQueue/PostgreSQL.pm deleted file mode 100644 index 2a71cea1..00000000 --- a/Netdisco/lib/App/Netdisco/Daemon/JobQueue/PostgreSQL.pm +++ /dev/null @@ -1,16 +0,0 @@ -package App::Netdisco::Daemon::JobQueue::PostgreSQL; - -use App::Netdisco::JobQueue::PostgreSQL (); - -use Role::Tiny; -use namespace::clean; - -sub jq_get { shift and App::Netdisco::JobQueue::PostgreSQL::jq_get(@_) } -sub jq_getlocal { shift and App::Netdisco::JobQueue::PostgreSQL::jq_getlocal(@_) } -sub jq_queued { shift and App::Netdisco::JobQueue::PostgreSQL::jq_queued(@_) } -sub jq_lock { shift and App::Netdisco::JobQueue::PostgreSQL::jq_lock(@_) } -sub jq_defer { shift and App::Netdisco::JobQueue::PostgreSQL::jq_defer(@_) } -sub jq_complete { shift and App::Netdisco::JobQueue::PostgreSQL::jq_complete(@_) } -sub jq_insert { shift and App::Netdisco::JobQueue::PostgreSQL::jq_insert(@_) } - -1;