summaryrefslogtreecommitdiffstats
path: root/bin/puppet
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-10-28 05:39:59 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-10-28 05:39:59 +0000
commitb6c63f6924250a14e998f4256e81c30e950fed99 (patch)
tree8915ec8881f2389b208dfda27a12d11f69730398 /bin/puppet
parent0ae5e3392597452acf6a2e9f0d4ac976b8ec9846 (diff)
downloadpuppet-b6c63f6924250a14e998f4256e81c30e950fed99.tar.gz
puppet-b6c63f6924250a14e998f4256e81c30e950fed99.tar.xz
puppet-b6c63f6924250a14e998f4256e81c30e950fed99.zip
Central logging now works, although there appear to be a few kinks to work out.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@732 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppet')
-rwxr-xr-xbin/puppet8
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/puppet b/bin/puppet
index 84c910e97..58b0772b8 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -118,12 +118,10 @@ begin
when "--debug"
debug = true
when "--logdest"
- # FIXME we should be able to have log.rb check the validity of the dst
- case arg
- when "syslog", "console", /^\//:
+ begin
Puppet[:logdest] = arg
- else
- $stderr.puts "Invalid log destination %s" % arg
+ rescue => detail
+ $stderr.puts detail.to_s
end
when "--vardir"
Puppet[:puppetvar] = arg