diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-09 21:15:38 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-09 21:15:38 +0000 |
| commit | 7f7b5c679ff4957dcd94b4652033b9fad871cad2 (patch) | |
| tree | 2e2c928b369ae7d2047c3b2ff3014e1bfbec2538 /bin/puppetd | |
| parent | b13b5edba1f8e1834b15e5b7244869afe814da93 (diff) | |
Change in how logging is defaulted: by default logs go to :syslog, unless the user explicitly gives at least one --logdest argument, in which case logs only go to the destinations the user gave.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@895 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppetd')
| -rwxr-xr-x | bin/puppetd | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/puppetd b/bin/puppetd index 742786c8b..b6cb2535a 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -142,11 +142,9 @@ begin when "--verbose" Puppet::Log.level = :info Puppet::Log.newdestination(:console) - setdest = true when "--debug" Puppet::Log.level = :debug Puppet::Log.newdestination(:console) - setdest = true when "--fqdn" fqdn = arg when "--onetime" @@ -156,6 +154,7 @@ begin when "--logdest" begin Puppet::Log.newdestination(arg) + setdest = true rescue => detail $stderr.puts detail.to_s end |
