diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2010-07-17 17:25:04 +0200 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-18 19:44:08 -0700 |
| commit | 6e07a199011b434ea6d7b3c69d14e6ca7cf9cf8e (patch) | |
| tree | b4fcf70fec6ea861b8134584a2c6dd804bb6aa84 /lib/puppet | |
| parent | 5b68afe0be7abd4f6743c4ad05513b6879f40153 (diff) | |
| download | puppet-6e07a199011b434ea6d7b3c69d14e6ca7cf9cf8e.tar.gz puppet-6e07a199011b434ea6d7b3c69d14e6ca7cf9cf8e.tar.xz puppet-6e07a199011b434ea6d7b3c69d14e6ca7cf9cf8e.zip | |
Fix #4262 - Puppetmaster used to log compilation time
It looks like a merge went wrong and we were returning abruptely
from a benchmark block, thus jumping over a precious log information.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/indirector/catalog/compiler.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb index e85608ed1..c50022fff 100644 --- a/lib/puppet/indirector/catalog/compiler.rb +++ b/lib/puppet/indirector/catalog/compiler.rb @@ -72,9 +72,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code loglevel = networked? ? :notice : :none - benchmark(loglevel, "Compiled catalog for #{node.name}") do + benchmark(loglevel, str) do begin - return Puppet::Parser::Compiler.compile(node) + config = Puppet::Parser::Compiler.compile(node) rescue Puppet::Error => detail Puppet.err(detail.to_s) if networked? raise |