summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-18 23:36:22 -0600
committerLuke Kanies <luke@madstop.com>2007-11-18 23:36:22 -0600
commit9cf477b6cc771eab7bd29d18c49128571e877987 (patch)
tree0ea0ccdd1159b0dc6ed1a14fde182146ff564637
parent26e9bd5637a8b002b9bc214793f95cbde4932bb2 (diff)
downloadpuppet-9cf477b6cc771eab7bd29d18c49128571e877987.tar.gz
puppet-9cf477b6cc771eab7bd29d18c49128571e877987.tar.xz
puppet-9cf477b6cc771eab7bd29d18c49128571e877987.zip
Applying fix by Jeff McCune from #905
-rw-r--r--CHANGELOG5
-rw-r--r--lib/puppet/network/http_server/mongrel.rb4
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7ecdb75b9..6dbb730cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+ Changed the behavior of --debug to include Mongrel client
+ debugging information. Mongrel output will be written to
+ the terminal only, not to the puppet debug log. This should
+ help anyone working with reverse HTTP SSL proxies. (#905)
+
Fixed #800 -- invalid configurations are no longer
cached. This was done partially by adding a relationship
validation step once the entire configuration is created,
diff --git a/lib/puppet/network/http_server/mongrel.rb b/lib/puppet/network/http_server/mongrel.rb
index ba4b048b3..ce2196eca 100644
--- a/lib/puppet/network/http_server/mongrel.rb
+++ b/lib/puppet/network/http_server/mongrel.rb
@@ -54,6 +54,10 @@ module Puppet::Network
attr_reader :xmlrpc_server
def initialize(handlers)
+ if Puppet[:debug]
+ $mongrel_debug_client = true
+ Puppet.debug 'Mongrel client debugging enabled. [$mongrel_debug_client = true].'
+ end
# Create a new instance of BasicServer. We are supposed to subclass it
# but that does not make sense since we would not introduce any new
# behaviour and we have to subclass Mongrel::HttpHandler so our handler