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