diff options
Diffstat (limited to 'lib/puppet/server')
| -rwxr-xr-x | lib/puppet/server/report.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/server/servlet.rb | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/puppet/server/report.rb b/lib/puppet/server/report.rb index d6ed706f9..1c217561f 100755 --- a/lib/puppet/server/report.rb +++ b/lib/puppet/server/report.rb @@ -114,7 +114,7 @@ class Server f.puts report end rescue => detail - if Puppet[:debug] + if Puppet[:trace] puts detail.backtrace end Puppet.warning "Could not write report for %s at %s: %s" % diff --git a/lib/puppet/server/servlet.rb b/lib/puppet/server/servlet.rb index 8fc872293..136bbb933 100644 --- a/lib/puppet/server/servlet.rb +++ b/lib/puppet/server/servlet.rb @@ -43,7 +43,6 @@ class Server end ip = request.peeraddr[3] if request.client_cert - begin if @puppetserver.authconfig.exists? allowed = @puppetserver.authconfig.allowed?(method, client, ip) @@ -71,11 +70,6 @@ class Server return false end end - rescue => detail - puts detail - puts detail.backtrace - raise - end else if method =~ /^puppetca\./ Puppet.notice "Allowing %s(%s) untrusted access to CA methods" % |