adding Puppet#recmkdir utility function, and making sure Log and Storage create their own files and directories as necessary

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

5 files changed, 85 insertions, 7 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index e227aab1f..ac7309da8 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -84,6 +84,21 @@ module Puppet
         end
 	end
 
+    def Puppet.recmkdir(dir,mode = 0755)
+        tmp = dir.sub(/^\//,'')
+        path = [File::SEPARATOR]
+        tmp.split(File::SEPARATOR).each { |dir|
+            path.push dir
+            if ! FileTest.exist?(File.join(path))
+                Dir.mkdir(File.join(path), mode)
+            elsif FileTest.directory?(File.join(path))
+                next
+            else FileTest.exist?(File.join(path))
+                raise "Cannot create %s: basedir %s is a file" %
+                    [dir, File.join(path)]
+            end
+        }
+    end
 end
 
 require 'puppet/storage'
diff --git a/lib/puppet/log.rb b/lib/puppet/log.rb
index 06d7a0650..20aaff003 100644
--- a/lib/puppet/log.rb
+++ b/lib/puppet/log.rb
@@ -44,6 +44,12 @@ module Puppet
             end
         end
 
+        def Log.flush
+            if defined? @@logfile
+                @@logfile.flush
+            end
+        end
+
         def Log.create(level,*ary)
             msg = ary.join(" ")
 
@@ -67,7 +73,7 @@ module Puppet
         end
 
         def Log.destination=(dest)
-            if dest == "syslog" || dest == :syslog
+            if dest == "syslog" or dest == :syslog
                 unless defined? @@syslog
                     @@syslog = Syslog.open("puppet")
                 end
@@ -76,13 +82,37 @@ module Puppet
                 if defined? @@logfile
                     @@logfile.close
                 end
+
+                @@logpath = dest
+
+                # first make sure the directory exists
+                unless FileTest.exist?(File.dirname(dest))
+                    begin
+                        Puppet.recmkdir(File.dirname(dest))
+                        Puppet.info "Creating log directory %s" %
+                            File.dirname(dest)
+                    rescue => detail
+                        Log.destination = :console
+                        Puppet.err "Could not create log directory: %s" %
+                            detail
+                        return
+                    end
+                end
+
                 begin
-                    @@logfile = File.open(dest,"w")
+                    # create the log file, if it doesn't already exist
+                    @@logfile = File.open(dest,File::WRONLY|File::CREAT|File::APPEND)
                 rescue => detail
-                    raise
+                    Log.destination = :console
+                    Puppet.err "Could not create log file: %s" %
+                        detail
+                    return
                 end
                 @@logdest = :file
             else
+                unless @@logdest == :console or @@logdest == "console"
+                    Puppet.notice "Invalid log setting %s; setting log destination to 'console'" % @@logdest
+                end
                 @@logdest = :console
             end
         end
diff --git a/lib/puppet/storage.rb b/lib/puppet/storage.rb
index 53b3b5a6e..28d593db0 100644
--- a/lib/puppet/storage.rb
+++ b/lib/puppet/storage.rb
@@ -35,6 +35,21 @@ module Puppet
 		end
 
 		def Storage.store
+            unless FileTest.directory?(File.dirname(Puppet[:statefile]))
+                begin
+                    Puppet.recmkdir(Puppet[:statefile])
+                    Puppet.info "Creating state directory %s" %
+                        File.basename(Puppet[:statefile])
+                rescue => detail
+                    Puppet.err "Could not create state file: %s" % detail
+                    return
+                end
+            end
+
+            unless FileTest.exist?(Puppet[:statefile])
+                Puppet.info "Creating state file %s" % Puppet[:statefile]
+            end
+
 			File.open(Puppet[:statefile], File::CREAT|File::WRONLY, 0600) { |file|
 				@@state.each { |klass, thash|
                     thash.each { |key,value|
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index eb3bc2e03..652366dcb 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -118,9 +118,15 @@ class Type < Puppet::Element
     #---------------------------------------------------------------
 
     #---------------------------------------------------------------
-    #def debug(ary)
-    #    Puppet[:debug] = ary.shift
-    #end
+    def debug(ary)
+        value = ary.shift
+        if value == "true" or value == true
+            value = true
+        else
+            value = value
+        end
+        Puppet[:debug] = value
+    end
     #---------------------------------------------------------------
 
     #---------------------------------------------------------------
diff --git a/test/other/tc_log.rb b/test/other/tc_log.rb
index eee3e192c..98e62bb0d 100644
--- a/test/other/tc_log.rb
+++ b/test/other/tc_log.rb
@@ -49,7 +49,7 @@ class TestLog < Test::Unit::TestCase
         }
         msgs = mkmsgs(levels)
         assert(msgs.length == levels.length)
-        Puppet::Log.close
+        Puppet::Log.flush
         count = 0
         assert_nothing_raised() {
             File.open(@@logfile) { |of|
@@ -108,4 +108,16 @@ class TestLog < Test::Unit::TestCase
         assert(Puppet.err("This is an error").is_a?(Puppet::Log))
         assert(Puppet.debug("This is debugging").is_a?(Puppet::Log))
     end
+
+    def test_creatingdirs
+        curdest = Puppet[:logdest]
+
+        Puppet[:logdest] = "/tmp/logtesting/logfile"
+        Puppet.info "testing logs"
+        assert(FileTest.directory?("/tmp/logtesting"))
+        assert(FileTest.file?("/tmp/logtesting/logfile"))
+
+        system("rm -rf /tmp/logtesting")
+        Puppet[:logdest] = curdest
+    end
 end