From 32dcb31a7a371ea542bf3c733d3d775ef3a8e51d Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Mon, 22 Nov 2010 11:27:37 -0800 Subject: (#5370) Made metrics and --summarize work with Puppet apply Puppet apply and Puppet agent use different code paths to run the transaction. In the code path for Puppet apply, we weren't passing the report to catalog.apply, and as a result catalog.apply was creating its own report to store metrics in; this report was then discarded. As a result, reports generated using "puppet apply" had no metrics, and the "--summarize" option didn't work at all. Fixed by modifying the "puppet apply" code path to pass the report to catalog.apply. In the future it would be nice to refactor the two code paths to be the same. Paired-with: Jesse Wolfe --- lib/puppet/application/apply.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb index 59a95d35a..f6299f9fe 100644 --- a/lib/puppet/application/apply.rb +++ b/lib/puppet/application/apply.rb @@ -130,7 +130,7 @@ class Puppet::Application::Apply < Puppet::Application report = configurer.initialize_report Puppet::Util::Log.newdestination(report) end - transaction = catalog.apply + transaction = catalog.apply(:report => report) configurer.execute_postrun_command -- cgit