From 36b4adcc0655e8b571cbb106c9848327403caf28 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 3 Sep 2017 16:17:29 +0100 Subject: [PATCH] disambiguate util/backend package and remove backend prelaod --- bin/netdisco-backend-fg | 18 +----------------- lib/App/Netdisco/Backend/Worker/Common.pm | 2 +- lib/App/Netdisco/Backend/Worker/Manager.pm | 2 +- lib/App/Netdisco/Backend/Worker/Scheduler.pm | 2 +- lib/App/Netdisco/Util/{Backend.pm => MCE.pm} | 2 +- 5 files changed, 5 insertions(+), 21 deletions(-) rename lib/App/Netdisco/Util/{Backend.pm => MCE.pm} (91%) diff --git a/bin/netdisco-backend-fg b/bin/netdisco-backend-fg index d89fc9e4..a5657adc 100755 --- a/bin/netdisco-backend-fg +++ b/bin/netdisco-backend-fg @@ -29,26 +29,10 @@ BEGIN { setting('workers')->{'BACKEND'} ||= (hostfqdn || 'fqdn-undefined'); } -use App::Netdisco::Util::Backend; +use App::Netdisco::Util::MCE; # set $0 and parse maxworkers use NetAddr::IP::Lite ':lower'; # to quench AF_INET6 symbol errors use Role::Tiny::With; -# preload all worker modules into shared memory -use App::Netdisco::Backend::Job (); -use App::Netdisco::Backend::Util (); -use App::Netdisco::Backend::Worker::Common (); -use App::Netdisco::Backend::Worker::Interactive::DeviceActions (); -use App::Netdisco::Backend::Worker::Interactive::PortActions (); -use App::Netdisco::Backend::Worker::Manager (); -use App::Netdisco::Backend::Worker::Poller::Arpnip (); -use App::Netdisco::Backend::Worker::Poller::Common (); -use App::Netdisco::Backend::Worker::Poller::Device (); -use App::Netdisco::Backend::Worker::Poller::Expiry (); -use App::Netdisco::Backend::Worker::Poller::Macsuck (); -use App::Netdisco::Backend::Worker::Poller::Nbtstat (); -use App::Netdisco::Backend::Worker::Poller (); -use App::Netdisco::Backend::Worker::Scheduler (); - use MCE::Signal '-setpgrp'; use MCE::Flow Sereal => 1; use MCE::Queue; diff --git a/lib/App/Netdisco/Backend/Worker/Common.pm b/lib/App/Netdisco/Backend/Worker/Common.pm index 5390a4db..59ef5d0d 100644 --- a/lib/App/Netdisco/Backend/Worker/Common.pm +++ b/lib/App/Netdisco/Backend/Worker/Common.pm @@ -3,7 +3,7 @@ package App::Netdisco::Backend::Worker::Common; use Dancer qw/:moose :syntax :script/; use Try::Tiny; -use App::Netdisco::Util::Backend; +use App::Netdisco::Util::MCE; use Role::Tiny; use namespace::clean; diff --git a/lib/App/Netdisco/Backend/Worker/Manager.pm b/lib/App/Netdisco/Backend/Worker/Manager.pm index ee17349c..6b954fbe 100644 --- a/lib/App/Netdisco/Backend/Worker/Manager.pm +++ b/lib/App/Netdisco/Backend/Worker/Manager.pm @@ -3,7 +3,7 @@ package App::Netdisco::Backend::Worker::Manager; use Dancer qw/:moose :syntax :script/; use List::Util 'sum'; -use App::Netdisco::Util::Backend; +use App::Netdisco::Util::MCE; use Role::Tiny; use namespace::clean; diff --git a/lib/App/Netdisco/Backend/Worker/Scheduler.pm b/lib/App/Netdisco/Backend/Worker/Scheduler.pm index 10b44422..912f49c5 100644 --- a/lib/App/Netdisco/Backend/Worker/Scheduler.pm +++ b/lib/App/Netdisco/Backend/Worker/Scheduler.pm @@ -3,7 +3,7 @@ package App::Netdisco::Backend::Worker::Scheduler; use Dancer qw/:moose :syntax :script/; use Algorithm::Cron; -use App::Netdisco::Util::Backend; +use App::Netdisco::Util::MCE; use Role::Tiny; use namespace::clean; diff --git a/lib/App/Netdisco/Util/Backend.pm b/lib/App/Netdisco/Util/MCE.pm similarity index 91% rename from lib/App/Netdisco/Util/Backend.pm rename to lib/App/Netdisco/Util/MCE.pm index 575959b7..4ea49b1a 100644 --- a/lib/App/Netdisco/Util/Backend.pm +++ b/lib/App/Netdisco/Util/MCE.pm @@ -1,4 +1,4 @@ -package App::Netdisco::Util::Backend; +package App::Netdisco::Util::MCE; use strict; use warnings;