Feature #2935: lazify require graph for applications

Because environments have to declare their mode before puppet tries to
load defaults.rb, it reduces the complexity considerably to have
application classes to load their lib dependencies at the last possible
moment.

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 44c8c027b..993d7df44 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -1,8 +1,4 @@
-require 'puppet'
 require 'puppet/application'
-require 'puppet/daemon'
-require 'puppet/network/server'
-require 'puppet/network/http/rack' if Puppet.features.rack?
 
 class Puppet::Application::Master < Puppet::Application
 
@@ -37,6 +33,7 @@ class Puppet::Application::Master < Puppet::Application
         end
 
         # Create this first-off, so we have ARGV
+        require 'puppet/daemon'
         @daemon = Puppet::Daemon.new
         @daemon.argv = ARGV.dup
     end
@@ -108,6 +105,7 @@ class Puppet::Application::Master < Puppet::Application
         end
 
         unless options[:rack]
+            require 'puppet/network/server'
             @daemon.server = Puppet::Network::Server.new(:xmlrpc_handlers => xmlrpc_handlers)
             @daemon.daemonize if Puppet[:daemonize]
         else