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/puppetd b/bin/puppetd
index 2d11f4d7e..68cfad09d 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -12,6 +12,7 @@
 #               [--ssldir <cert directory>] [-l|--logdest <syslog|<file>|console>]
 #               [--fqdn <host name>] [-p|--port <port>] [-s|--server <server>]
 #               [-w|--waitforcert <seconds>] [-c|--confdir <configuration directory>]
+#               [--vardir <var directory>]
 #
 # = Description
 #
@@ -58,6 +59,10 @@
 # ssldir::
 #   Where to store and find certificates.  Defaults to /etc/puppet/ssl.
 #
+# vardir::
+#   The variable-size directory, used for storing state.  Defaults to
+#   /var/puppet.
+#
 # verbose::
 #   Turn on verbose reporting.
 #
@@ -106,6 +111,7 @@ result = GetoptLong.new(
 	[ "--ssldir",   				GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
 	[ "--version",	"-V",			GetoptLong::NO_ARGUMENT ],
+	[ "--vardir",	    			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--waitforcert",	"-w",		GetoptLong::REQUIRED_ARGUMENT ]
 )
 
@@ -152,6 +158,8 @@ begin
                 else
                     $stderr.puts "Invalid log destination %s" % arg
                 end
+            when "--vardir"
+                Puppet[:puppetvar] = arg
             when "--waitforcert"
                 waitforcert = arg
         end