From 61ef2893c57584ad3166241c6e412c1b4d014a4b Mon Sep 17 00:00:00 2001
From: David Schmitt <david@schmitt.edv-bus.at>
Date: Fri, 9 Nov 2007 18:29:04 +0100
Subject: fix #815: add :main to all use() for :reporting and :metrics

---
 lib/puppet/indirector/report/processor.rb | 2 +-
 lib/puppet/network/handler/report.rb      | 2 +-
 lib/puppet/reports/store.rb               | 2 +-
 lib/puppet/util/metric.rb                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/puppet')

diff --git a/lib/puppet/indirector/report/processor.rb b/lib/puppet/indirector/report/processor.rb
index d2b7c84f3..fd1bc413a 100644
--- a/lib/puppet/indirector/report/processor.rb
+++ b/lib/puppet/indirector/report/processor.rb
@@ -7,7 +7,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
         the report types listed in the 'reports' setting."
 
     def initialize
-        Puppet.settings.use(:reporting, :metrics)
+        Puppet.settings.use(:main, :reporting, :metrics)
     end
 
     def save(report)
diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb
index 12abc9b15..8ddeed9f6 100755
--- a/lib/puppet/network/handler/report.rb
+++ b/lib/puppet/network/handler/report.rb
@@ -18,7 +18,7 @@ class Puppet::Network::Handler
 
         def initialize(*args)
             super
-            Puppet.settings.use(:reporting, :metrics)
+            Puppet.settings.use(:main, :reporting, :metrics)
         end
 
         # Accept a report from a client.
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index dfc992820..b7ef42a7b 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -1,7 +1,7 @@
 require 'puppet'
 
 Puppet::Reports.register_report(:store) do
-    Puppet.settings.use(:reporting)
+    Puppet.settings.use(:main, :reporting)
 
     desc "Store the yaml report on disk.  Each host sends its report as a YAML dump
         and this just stores the file on disk, in the ``reportdir`` directory.
diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index d0719ff3b..ca23aa87f 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -21,7 +21,7 @@ class Puppet::Util::Metric
     end
 
     def create(start = nil)
-        Puppet.settings.use(:metrics)
+        Puppet.settings.use(:main, :metrics)
 
         start ||= Time.now.to_i - 5
 
-- 
cgit