diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-02-25 15:17:39 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-02-25 15:17:39 -0800 |
| commit | 448a439f5abc3d51accececb678e9c5f547f7615 (patch) | |
| tree | 1dd9181f46e01f121bb0d0b1af1029cd36ff772a /lib/puppet/network | |
| parent | 06939c51a3f675137b53fac8a521132a4c9cfcbe (diff) | |
| parent | e27d208db86ae0825afbc6fb34d39e7c047a1bf4 (diff) | |
| download | puppet-448a439f5abc3d51accececb678e9c5f547f7615.tar.gz puppet-448a439f5abc3d51accececb678e9c5f547f7615.tar.xz puppet-448a439f5abc3d51accececb678e9c5f547f7615.zip | |
Merge remote branch 'brice/feature/process-instrumentation' into next
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/http/handler.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index 2b9e81b61..aa33f82f7 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -5,10 +5,12 @@ 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 @@ -65,7 +67,9 @@ module Puppet::Network::HTTP::Handler check_authorization(indirection, method, key, params) - send("do_#{method}", indirection, key, params, request, response) + instrument("processing #{indirection} #{key}") do + send("do_#{method}", indirection, key, params, request, response) + end rescue SystemExit,NoMemoryError raise rescue Exception => e |