Merge commit 'davids-bugfixes/rest/fix-815-by-using-main-explicitly'

2 files changed, 3 insertions, 9 deletions

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
 
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 0bd288ec2..1db396dc4 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -643,13 +643,6 @@ Generated on #{Time.now}.
                 @used = []
             end
 
-            runners = sections.collect { |s|
-                symbolize(s)
-            }.find_all { |s|
-                ! @used.include? s
-            }
-            return if runners.empty?
-
             bucket = to_transportable(*sections)
 
             config = bucket.to_configuration
@@ -661,7 +654,8 @@ Generated on #{Time.now}.
             end
             config.clear
 
-            runners.each { |s| @used << s }
+            sections.each { |s| @used << s }
+            @used.uniq
         end
     end