summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-05-09 13:40:59 -0700
committerLuke Kanies <luke@madstop.com>2009-05-27 10:57:45 -0500
commite0c19f99f44d94715984d5533daed25e35ac6f3b (patch)
treefd454912283626c4bcb6cd4e05a02d2116d8b96c /lib/puppet
parentab34cf610ee529fcbbf777aae7b382090af1a8b2 (diff)
downloadpuppet-e0c19f99f44d94715984d5533daed25e35ac6f3b.tar.gz
puppet-e0c19f99f44d94715984d5533daed25e35ac6f3b.tar.xz
puppet-e0c19f99f44d94715984d5533daed25e35ac6f3b.zip
Fixing #2228 - --logdest works again in puppetd and puppetmasterd
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/application/puppetd.rb2
-rw-r--r--lib/puppet/application/puppetmasterd.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 1f97043fa..83bb65691 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -65,7 +65,7 @@ Puppet::Application.new(:puppetd) do
options[:waitforcert] = 0 unless @explicit_waitforcert
end
- option("--logdest", "-l") do |arg|
+ option("--logdest DEST", "-l DEST") do |arg|
begin
Puppet::Util::Log.newdestination(arg)
options[:setdest] = true
diff --git a/lib/puppet/application/puppetmasterd.rb b/lib/puppet/application/puppetmasterd.rb
index 52f33cba9..e5051293f 100644
--- a/lib/puppet/application/puppetmasterd.rb
+++ b/lib/puppet/application/puppetmasterd.rb
@@ -14,7 +14,7 @@ Puppet::Application.new(:puppetmasterd) do
# internal option, only to be used by ext/rack/config.ru
option("--rack")
- option("--logdest", "-l") do |arg|
+ option("--logdest DEST", "-l DEST") do |arg|
begin
Puppet::Util::Log.newdestination(arg)
options[:setdest] = true