From b6e4ef37f7ac4844697f1857cbcf03a2796db7d4 Mon Sep 17 00:00:00 2001 From: "John A. Barbuto" Date: Thu, 22 Oct 2009 18:16:16 -0700 Subject: Fixed #2750 - Set :cacrl to nil instead of 'false' in puppetd The latter is deprecated and was keeping puppetd from starting. Also added a test and fixed a typo in another test. Signed-off-by: John A. Barbuto --- lib/puppet/application/puppetd.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet/application') diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb index 4799d5571..26c9f825e 100644 --- a/lib/puppet/application/puppetd.rb +++ b/lib/puppet/application/puppetd.rb @@ -164,7 +164,7 @@ Puppet::Application.new(:puppetd) do # to clients. In the meantime, we just disable CRL checking if # the CRL file doesn't exist unless File::exist?(Puppet[:cacrl]) - Puppet[:cacrl] = 'false' + Puppet[:cacrl] = nil end handlers = nil -- cgit From ff3a7bc17b66b73f5cf155a2ffb62ccd85f9e9bc Mon Sep 17 00:00:00 2001 From: "John A. Barbuto" Date: Mon, 26 Oct 2009 14:02:35 -0700 Subject: Re-fixed #2750 - Stop disabling the CRL or checking for a disabled CRL This was deprecated in commit 1cfb0215 and was keeping puppetd from starting in listen mode. Signed-off-by: John A. Barbuto --- lib/puppet/application/puppetd.rb | 7 ------- 1 file changed, 7 deletions(-) (limited to 'lib/puppet/application') diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb index 26c9f825e..56aaf9370 100644 --- a/lib/puppet/application/puppetd.rb +++ b/lib/puppet/application/puppetd.rb @@ -160,13 +160,6 @@ Puppet::Application.new(:puppetd) do exit(14) end - # FIXME: we should really figure out how to distribute the CRL - # to clients. In the meantime, we just disable CRL checking if - # the CRL file doesn't exist - unless File::exist?(Puppet[:cacrl]) - Puppet[:cacrl] = nil - end - handlers = nil if options[:serve].empty? -- cgit From 6c2daa36ded879763cfc1a6fac8f4e6d75a3cadb Mon Sep 17 00:00:00 2001 From: Brice Figureau Date: Wed, 11 Nov 2009 20:25:28 +0100 Subject: Fix #2783 - Puppetdoc rdoc should use environment to get modulepath/manifestdir Puppetdoc wasn't using the current environment to find the correct modulepath and manifestdir. Signed-off-by: Brice Figureau --- lib/puppet/application/puppetdoc.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/puppet/application') diff --git a/lib/puppet/application/puppetdoc.rb b/lib/puppet/application/puppetdoc.rb index a5496ccee..5656112d0 100644 --- a/lib/puppet/application/puppetdoc.rb +++ b/lib/puppet/application/puppetdoc.rb @@ -66,8 +66,9 @@ Puppet::Application.new(:puppetdoc) do exit_code = 0 files = [] unless @manifest - files += Puppet[:modulepath].split(':').collect { |p| File.expand_path(p) } - files += Puppet[:manifestdir].split(':').collect { |p| File.expand_path(p) } + env = Puppet::Node::Environment.new + files += env.modulepath + files += env.manifestdir end files += ARGV Puppet.info "scanning: %s" % files.inspect -- cgit From bd5dc649ad55fc4724cafad99852b825adfde182 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Thu, 12 Nov 2009 23:30:13 -0800 Subject: Possible workaround for #2824 (MRI GC bug) This is a moderately ugly workaround for the MRI garbage collection bug (see the ticket for details). I explored several other potential solutions (notably, monkey patching the routines that trigger the bug) but none of them were satisfactory. Monkey patching sub, gsub, sub!, gsub!, etc., for example, either changes the scoping of $~, $1, etc. in a way that could potentially subtly change the meaning of programs or (if you are clever) faithfully reproduces the behaviour of MRI--including the memory leak. I decided to go with the standardized and somewhat obnoxious never- used optional argument as it was easy to automatically insert and should be even easier to automatically find and remove if a better fix is developed. It also should be obtrusive enough to escape accidental removal in refactoring. --- lib/puppet/application/puppetdoc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet/application') diff --git a/lib/puppet/application/puppetdoc.rb b/lib/puppet/application/puppetdoc.rb index 5656112d0..0a4e0c3c3 100644 --- a/lib/puppet/application/puppetdoc.rb +++ b/lib/puppet/application/puppetdoc.rb @@ -192,7 +192,7 @@ Puppet::Application.new(:puppetdoc) do end end - def setup_rdoc + def setup_rdoc(dummy_argument=:work_arround_for_ruby_GC_bug) # consume the unknown options # and feed them as settings if @unknown_args.size > 0 -- cgit From 8129caabdab73fca8b4b8de0ecafe4c0dd31cc95 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Thu, 19 Nov 2009 12:34:40 -0800 Subject: Fix for ticket #2700 -- check for @explicit_waitforcert in puppetd --test --- lib/puppet/application/puppetd.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet/application') diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb index 56aaf9370..37a5d003d 100644 --- a/lib/puppet/application/puppetd.rb +++ b/lib/puppet/application/puppetd.rb @@ -125,7 +125,7 @@ Puppet::Application.new(:puppetd) do Puppet.settings.handlearg("--no-daemonize") options[:verbose] = true options[:onetime] = true - options[:waitforcert] = 0 + options[:waitforcert] = 0 unless @explicit_waitforcert end # Handle the logging settings. -- cgit