Moving some of the stand-alone classes into the util/ subdirectory, to clean up the top-level namespace a bit. This is a lot of file modifications, but most of them just change class names and file paths.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2178 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index bd02a9dc3..9fdb33bcf 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -29,7 +29,7 @@ module Puppet
             end
 
             # Get rid of console logging
-            Puppet::Log.close(:console)
+            Puppet::Util::Log.close(:console)
 
             Process.setsid
             Dir.chdir("/")
@@ -37,7 +37,7 @@ module Puppet
                 $stdin.reopen "/dev/null"
                 $stdout.reopen "/dev/null", "a"
                 $stderr.reopen $stdout
-                Puppet::Log.reopen
+                Puppet::Util::Log.reopen
             rescue => detail
                 File.open("/tmp/daemonout", "w") { |f|
                     f.puts "Could not start %s: %s" % [Puppet.name, detail]
@@ -264,8 +264,8 @@ module Puppet
             rmpidfile()
 
             # And close all logs except the console.
-            Puppet::Log.destinations.reject { |d| d == :console }.each do |dest|
-                Puppet::Log.close(dest)
+            Puppet::Util::Log.destinations.reject { |d| d == :console }.each do |dest|
+                Puppet::Util::Log.close(dest)
             end
 
             super