summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-23 17:10:24 -0600
committerLuke Kanies <luke@madstop.com>2007-11-23 17:10:24 -0600
commit7efe24f1d157997ab23faab2c4f1431a70cb1c9a (patch)
tree4276117118c55ad994e3ca5d23171d19cfddf22d
parent56aad69f8cdf8b0b08fdb7985014986223fa4455 (diff)
downloadpuppet-7efe24f1d157997ab23faab2c4f1431a70cb1c9a.tar.gz
puppet-7efe24f1d157997ab23faab2c4f1431a70cb1c9a.tar.xz
puppet-7efe24f1d157997ab23faab2c4f1431a70cb1c9a.zip
Fixing #882 -- I just added a quick hook to the
Master handler again; we need a better long-term solution, though.
-rw-r--r--lib/puppet/network/handler/master.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 1c7f7310e..8d84fe8b8 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -64,7 +64,10 @@ class Puppet::Network::Handler
Puppet::Node::Facts.new(client, facts).save unless local?
# And get the configuration from the config handler
- config = config_handler.configuration(client)
+ config = nil
+ benchmark(:notice, "Compiled configuration for %s" % client) do
+ config = config_handler.configuration(client)
+ end
return translate(config.extract)
end