Fixing #301 -- s/logfile/logdest/g

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

1 files changed, 8 insertions, 4 deletions

diff --git a/bin/puppet b/bin/puppet
index 025522417..3148cbd50 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -8,7 +8,7 @@
 # = Usage
 #
 #   puppet [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-#               [-l|--logfile <file>] <file>
+#               [-l|--logdest <file>] <file>
 #
 # = Description
 #
@@ -39,7 +39,7 @@
 #   /etc/puppet/classes.txt), and setting this option causes all of those classes
 #   to be set in your +puppet+ manifest.
 #
-# logfile::
+# logdest::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to the console.
 #
@@ -93,6 +93,7 @@ verbose = false
 noop = false
 logfile = false
 loadclasses = false
+logset = false
 
 code = nil
 
@@ -100,8 +101,6 @@ master = {
     :Local => true
 }
 
-Puppet::Log.newdestination(:console)
-
 begin
     result.each { |opt,arg|
         case opt
@@ -128,6 +127,7 @@ begin
             when "--logdest"
                 begin
                     Puppet::Log.newdestination(arg)
+                    logset = true
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
@@ -143,6 +143,10 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
+unless logset
+    Puppet::Log.newdestination(:console)
+end
+
 client = nil
 server = nil