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/parser | |
| 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/parser')
| -rw-r--r-- | lib/puppet/parser/compiler.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index 4301e8c0f..fdabd05c9 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -4,7 +4,6 @@ require 'puppet/node' require 'puppet/resource/catalog' require 'puppet/util/errors' -require 'puppet/util/instrumentation' require 'puppet/resource/type_collection_helper' @@ -14,12 +13,9 @@ class Puppet::Parser::Compiler include Puppet::Util include Puppet::Util::Errors include Puppet::Resource::TypeCollectionHelper - extend Puppet::Util::Instrumentation def self.compile(node) - instrument("compiling #{node.name}") do - new(node).compile.to_resource - end + new(node).compile.to_resource rescue => detail puts detail.backtrace if Puppet[:trace] raise Puppet::Error, "#{detail} on node #{node.name}" |