summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-27 18:41:40 -0600
committerLuke Kanies <luke@madstop.com>2007-11-27 18:41:40 -0600
commit5d30ea93ad23d10564a765337b26d137d6643101 (patch)
tree522be69b7482cf36d2151c7fbb34cd3558ea4780
parent4e52ffc68045b07a1308ff7a679fb301c937884e (diff)
downloadpuppet-5d30ea93ad23d10564a765337b26d137d6643101.tar.gz
puppet-5d30ea93ad23d10564a765337b26d137d6643101.tar.xz
puppet-5d30ea93ad23d10564a765337b26d137d6643101.zip
Fixing #810 -- I catch the error and prefix it with something
a bit more useful.
-rw-r--r--lib/puppet/network/http_server/webrick.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb
index 2cf85b7b6..d2bb7b750 100644
--- a/lib/puppet/network/http_server/webrick.rb
+++ b/lib/puppet/network/http_server/webrick.rb
@@ -91,7 +91,12 @@ module Puppet
setup_webrick(hash)
- super(hash)
+ begin
+ super(hash)
+ rescue => detail
+ puts detail.backtrace if Puppet[:trace]
+ raise Puppet::Error, "Could not start WEBrick: %s" % detail
+ end
# make sure children don't inherit the sockets
listeners.each { |sock|