diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-03-01 11:38:02 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-03-01 11:44:33 -0800 |
| commit | 026eba3a7b568e6ef7c8ea8032ea49c65dfd8295 (patch) | |
| tree | 979af558cf94f7bf2f66a7a553a18de130c4ea83 /lib/puppet/network/http | |
| parent | 448a439f5abc3d51accececb678e9c5f547f7615 (diff) | |
| download | puppet-026eba3a7b568e6ef7c8ea8032ea49c65dfd8295.tar.gz puppet-026eba3a7b568e6ef7c8ea8032ea49c65dfd8295.tar.xz puppet-026eba3a7b568e6ef7c8ea8032ea49c65dfd8295.zip | |
Revert #5691 "Merge remote branch 'brice/feature/process-instrumentation' into next"
This reverts commit 448a439f5abc3d51accececb678e9c5f547f7615, reversing
changes made to 06939c51a3f675137b53fac8a521132a4c9cfcbe.
As per discussion in http://projects.puppetlabs.com/issues/5691#note-5
Diffstat (limited to 'lib/puppet/network/http')
| -rw-r--r-- | lib/puppet/network/http/handler.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index aa33f82f7..2b9e81b61 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -5,12 +5,10 @@ require 'puppet/network/http/api/v1' require 'puppet/network/rest_authorization' require 'puppet/network/rights' require 'resolv' -require 'puppet/util/instrumentation' module Puppet::Network::HTTP::Handler include Puppet::Network::HTTP::API::V1 include Puppet::Network::RestAuthorization - include Puppet::Util::Instrumentation attr_reader :server, :handler @@ -67,9 +65,7 @@ module Puppet::Network::HTTP::Handler check_authorization(indirection, method, key, params) - instrument("processing #{indirection} #{key}") do - send("do_#{method}", indirection, key, params, request, response) - end + send("do_#{method}", indirection, key, params, request, response) rescue SystemExit,NoMemoryError raise rescue Exception => e |