Adding logging methods to all Puppet::Element instances, and converting all instance log statements to use those methods. Additionally modified logging to take advantage of this by including the path of the logging object in the output. Logs will still need some cleanup to avoid duplicate information.

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

1 files changed, 8 insertions, 0 deletions

diff --git a/bin/puppet b/bin/puppet
index 25807ee1a..84c910e97 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -9,6 +9,7 @@
 #
 #   puppet [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
 #               [-l|--logfile <file>] [-p|--parse-only] <file>
+#               [-c|--confdir <configuration directory>] [--vardir <var directory>]
 #
 # = Description
 #
@@ -35,6 +36,10 @@
 # parse-only::
 #   Just verify syntax, do not apply anything.
 #
+# vardir::
+#   The variable-size directory, used for storing state.  Defaults to
+#   /var/puppet.
+#
 # verbose::
 #   Print extra information.
 #
@@ -73,6 +78,7 @@ result = GetoptLong.new(
     [ "--noop",     "-n",			GetoptLong::NO_ARGUMENT ],
     [ "--use-nodes",    			GetoptLong::NO_ARGUMENT ],
     [ "--parse-only",  "-p",		GetoptLong::NO_ARGUMENT ],
+	[ "--vardir",	    			GetoptLong::REQUIRED_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
 )
 
@@ -119,6 +125,8 @@ begin
                 else
                     $stderr.puts "Invalid log destination %s" % arg
                 end
+            when "--vardir"
+                Puppet[:puppetvar] = arg
         end
     }
 rescue GetoptLong::InvalidOption => detail