Fixing some logging issues

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

2 files changed, 21 insertions, 4 deletions

diff --git a/bin/puppetd b/bin/puppetd
index c082e2a80..18cfe7107 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -144,6 +144,8 @@ onetime = false
 
 centrallogs = false
 
+setdest = false
+
 begin
     result.each { |opt,arg|
         case opt
@@ -164,9 +166,11 @@ begin
             when "--verbose"
                 Puppet[:loglevel] = :info
                 Puppet[:logdest] = :console
+                setdest = true
             when "--debug"
                 Puppet[:loglevel] = :debug
                 Puppet[:logdest] = :console
+                setdest = true
             when "--noop"
                 Puppet[:noop] = true
             when "--schedule"
@@ -205,14 +209,16 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
-bg = false
-
 if Puppet[:loglevel] == :debug or Puppet[:loglevel] == :info
     args[:Daemonize] = false
 else
     args[:Daemonize] = true
 end
 
+unless setdest
+    Puppet[:logdest] = :syslog
+end
+
 args[:Server] = server
 if fqdn
     args[:FQDN] = fqdn
@@ -228,7 +234,7 @@ if centrallogs
 end
 
 
-Puppet.info "Starting Puppet client version %s" % [Puppet.version]
+Puppet.notice "Starting Puppet client version %s" % [Puppet.version]
 client = Puppet::Client::MasterClient.new(args)
 
 
@@ -251,7 +257,8 @@ unless client.readcert
     end
 end
 
-if bg
+if args[:Daemonize]
+    #exit(13)
     client.daemonize
 end
 
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index 685ff6485..6dc5a3fa9 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -154,6 +154,8 @@ havebucket = true
 
 parseonly = false
 
+setdest = false
+
 begin
     result.each { |opt,arg|
         case opt
@@ -164,6 +166,7 @@ begin
             when "--debug"
                 Puppet[:debug] = true
                 Puppet[:logdest] = :console
+                setdest = true
             when "--fsconfig"
                 unless FileTest.exists?(arg)
                     $stderr.puts "File server configuration file %s does not exist" %
@@ -197,6 +200,7 @@ begin
             when "--logdest"
                 begin
                     Puppet[:logdest] = arg
+                    setdest = true
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
@@ -210,6 +214,7 @@ begin
                 puts "%s" % Puppet.version
                 exit
             when "--verbose"
+                setdest = true
                 Puppet[:loglevel] = :info
                 Puppet[:logdest] = :console
             else
@@ -275,6 +280,9 @@ handlers = {
     :Logger => {}
 }
 
+unless setdest
+    Puppet[:logdest] = :syslog
+end
 
 if haveca
     handlers[:CA] = ca
@@ -299,6 +307,8 @@ end
 
 args[:Handlers] = handlers
 
+Puppet.notice "Starting Puppet server version %s" % [Puppet.version]
+
 begin
     # use the default, um, everything
     #server = Puppet::Server.new(:CA => ca)