diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/indirector/report/processor.rb | 2 | ||||
| -rwxr-xr-x | lib/puppet/network/handler/report.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/reports/store.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/metric.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/settings.rb | 10 |
5 files changed, 6 insertions, 12 deletions
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 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 |