From 4124a14e58369b3914a9d334df062bc9896a5812 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 11 Aug 2014 22:00:06 +0100
Subject: [PATCH] Do not autoload all modules in a namespace... picks up
 old/bad code

---
 Netdisco/Changes                 |  6 ++++++
 Netdisco/bin/netdisco-daemon-fg  | 16 ++++++++++++++--
 Netdisco/lib/App/Netdisco/Web.pm | 15 +++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 10acdb3b..1ab3fcb7 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.029004 - 2014-08-11
+
+  [BUG FIXES]
+
+  * Do not autoload all modules in a namespace... picks up old/bad code.
+
 2.029002 - 2014-08-10
 
   [ENHANCEMENTS]
diff --git a/Netdisco/bin/netdisco-daemon-fg b/Netdisco/bin/netdisco-daemon-fg
index 6bcfb713..31555ec1 100755
--- a/Netdisco/bin/netdisco-daemon-fg
+++ b/Netdisco/bin/netdisco-daemon-fg
@@ -29,8 +29,20 @@ use NetAddr::IP::Lite ':lower'; # to quench AF_INET6 symbol errors
 use Role::Tiny::With;
 
 # preload all worker modules into shared memory
-use Module::Find ();
-Module::Find::useall 'App::Netdisco::Daemon';
+use App::Netdisco::Daemon::Job ();
+use App::Netdisco::Daemon::Util ();
+use App::Netdisco::Daemon::Worker::Common ();
+use App::Netdisco::Daemon::Worker::Interactive::DeviceActions ();
+use App::Netdisco::Daemon::Worker::Interactive::PortActions ();
+use App::Netdisco::Daemon::Worker::Manager ();
+use App::Netdisco::Daemon::Worker::Poller::Arpnip ();
+use App::Netdisco::Daemon::Worker::Poller::Common ();
+use App::Netdisco::Daemon::Worker::Poller::Device ();
+use App::Netdisco::Daemon::Worker::Poller::Expiry ();
+use App::Netdisco::Daemon::Worker::Poller::Macsuck ();
+use App::Netdisco::Daemon::Worker::Poller::Nbtstat ();
+use App::Netdisco::Daemon::Worker::Poller ();
+use App::Netdisco::Daemon::Worker::Scheduler ();
 
 use MCE::Signal '-setpgrp';
 use MCE::Flow Sereal => 1;
diff --git a/Netdisco/lib/App/Netdisco/Web.pm b/Netdisco/lib/App/Netdisco/Web.pm
index 37747fe1..711b10d1 100644
--- a/Netdisco/lib/App/Netdisco/Web.pm
+++ b/Netdisco/lib/App/Netdisco/Web.pm
@@ -14,9 +14,20 @@ use Module::Find ();
 use Module::Load ();
 use App::Netdisco::Util::Web 'interval_to_daterange';
 
-# FIXME: need to avoid splat so that this can be reordered
+# can override splats only by loading first
 Module::Find::usesub 'App::NetdiscoE::Web';
-Module::Find::usesub 'App::Netdisco::Web';
+
+use App::Netdisco::Web::AuthN;
+use App::Netdisco::Web::Static;
+use App::Netdisco::Web::Search;
+use App::Netdisco::Web::Device;
+use App::Netdisco::Web::Report;
+use App::Netdisco::Web::AdminTask;
+use App::Netdisco::Web::TypeAhead;
+use App::Netdisco::Web::PortControl;
+use App::Netdisco::Web::Statistics;
+use App::Netdisco::Web::Password;
+use App::Netdisco::Web::GenericReport;
 
 sub _load_web_plugins {
   my $plugin_list = shift;