diff options
Diffstat (limited to 'lib/puppet/reports')
| -rw-r--r-- | lib/puppet/reports/rrdgraph.rb | 12 | ||||
| -rw-r--r-- | lib/puppet/reports/store.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/reports/tagmail.rb | 18 |
3 files changed, 17 insertions, 21 deletions
diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb index 3e2eeb7a6..508b1d28b 100644 --- a/lib/puppet/reports/rrdgraph.rb +++ b/lib/puppet/reports/rrdgraph.rb @@ -22,7 +22,7 @@ Puppet::Reports.register_report(:rrdgraph) do which defaults to the ``runinterval``." def hostdir - unless defined? @hostdir + unless defined?(@hostdir) @hostdir = File.join(Puppet[:rrddir], self.host) end @hostdir @@ -31,8 +31,7 @@ Puppet::Reports.register_report(:rrdgraph) do def htmlfile(type, graphs, field) file = File.join(hostdir, "%s.html" % type) File.open(file, "w") do |of| - of.puts "<html><head><title>%s graphs for %s</title></head><body>" % - [type.capitalize, host] + of.puts "<html><head><title>%s graphs for %s</title></head><body>" % [type.capitalize, host] graphs.each do |graph| if field == :first @@ -87,12 +86,9 @@ Puppet::Reports.register_report(:rrdgraph) do end File.open(File.join(hostdir, "index.html"), "w") do |of| - of.puts "<html><head><title>Report graphs for %s</title></head><body>" % - host + of.puts "<html><head><title>Report graphs for %s</title></head><body>" % host files.each do |file| - of.puts "<a href='%s'>%s</a><br/>" % - [File.basename(file), - File.basename(file).sub(".html",'').capitalize] + of.puts "<a href='%s'>%s</a><br/>" % [File.basename(file), File.basename(file).sub(".html",'').capitalize] end of.puts "</body></html>" end diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb index a71cd3387..8317ee243 100644 --- a/lib/puppet/reports/store.rb +++ b/lib/puppet/reports/store.rb @@ -10,13 +10,16 @@ Puppet::Reports.register_report(:store) do def mkclientdir(client, dir) config = Puppet::Util::Settings.new - config.setdefaults("reportclient-#{client}".to_sym, + + config.setdefaults( + "reportclient-#{client}".to_sym, "client-#{client}-dir" => { :default => dir, :mode => 0750, :desc => "Client dir for %s" % client, :owner => 'service', :group => 'service' }, + :noop => [false, "Used by settings internally."] ) @@ -51,8 +54,7 @@ Puppet::Reports.register_report(:store) do if Puppet[:trace] puts detail.backtrace end - Puppet.warning "Could not write report for %s at %s: %s" % - [client, file, detail] + Puppet.warning "Could not write report for %s at %s: %s" % [client, file, detail] end # Only testing cares about the return value diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb index 9f71782f0..01ff1b033 100644 --- a/lib/puppet/reports/tagmail.rb +++ b/lib/puppet/reports/tagmail.rb @@ -31,8 +31,7 @@ Puppet::Reports.register_report(:tagmail) do webservers that are not also from mailservers to ``httpadmins@domain.com``. If you are using anti-spam controls, such as grey-listing, on your mail - server you should whitelist the sending email (controlled by ``reportform`` - configuration option) to ensure your email is not discarded as spam. + server you should whitelist the sending email (controlled by ``reportform`` configuration option) to ensure your email is not discarded as spam. " @@ -109,8 +108,7 @@ Puppet::Reports.register_report(:tagmail) do # Process the report. This just calls the other associated messages. def process unless FileTest.exists?(Puppet[:tagmap]) - Puppet.notice "Cannot send tagmail report; no tagmap file %s" % - Puppet[:tagmap] + Puppet.notice "Cannot send tagmail report; no tagmap file %s" % Puppet[:tagmap] return end @@ -130,12 +128,12 @@ Puppet::Reports.register_report(:tagmail) do Net::SMTP.start(Puppet[:smtpserver]) do |smtp| reports.each do |emails, messages| smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p| - p.puts "From: #{Puppet[:reportfrom]}" - p.puts "Subject: Puppet Report for %s" % self.host - p.puts "To: " + emails.join(", ") - p.puts "Date: " + Time.now.rfc2822 - p.puts - p.puts messages + p.puts "From: #{Puppet[:reportfrom]}" + p.puts "Subject: Puppet Report for %s" % self.host + p.puts "To: " + emails.join(", ") + p.puts "Date: " + Time.now.rfc2822 + p.puts + p.puts messages end end end |