diff options
| author | Steven Jenkins <steven@endpoint.com> | 2009-09-18 14:15:32 -0400 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-09-20 13:24:12 +1000 |
| commit | 5c2ba479d17b6a88fa018947de0b00d16d531220 (patch) | |
| tree | 92e222457861f5ab0e3e3bd8f49b678bc89cdfd7 /lib/puppet/reports | |
| parent | a53a77cef6fe8f4216df3ac2a8a0d387021adb9b (diff) | |
| download | puppet-5c2ba479d17b6a88fa018947de0b00d16d531220.tar.gz puppet-5c2ba479d17b6a88fa018947de0b00d16d531220.tar.xz puppet-5c2ba479d17b6a88fa018947de0b00d16d531220.zip | |
FIXES 2616: Remove sync.syncronize and Puppet.info
Diffstat (limited to 'lib/puppet/reports')
| -rw-r--r-- | lib/puppet/reports/tagmail.rb | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb index 4fdaa5137..5b4a38e43 100644 --- a/lib/puppet/reports/tagmail.rb +++ b/lib/puppet/reports/tagmail.rb @@ -128,7 +128,6 @@ Puppet::Reports.register_report(:tagmail) do begin Net::SMTP.start(Puppet[:smtpserver]) do |smtp| reports.each do |emails, messages| - Puppet.info "Sending report to %s" % emails.join(", ") smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p| p.puts "From: #{Puppet[:reportfrom]}" p.puts "Subject: Puppet Report for %s" % self.host @@ -149,16 +148,13 @@ Puppet::Reports.register_report(:tagmail) do elsif Puppet[:sendmail] != "" begin reports.each do |emails, messages| - Puppet.info "Sending report to %s" % emails.join(", ") # We need to open a separate process for every set of email addresses - sync.synchronize do - IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p| - p.puts "From: #{Puppet[:reportfrom]}" - p.puts "Subject: Puppet Report for %s" % self.host - p.puts "To: " + emails.join(", ") + IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p| + p.puts "From: #{Puppet[:reportfrom]}" + p.puts "Subject: Puppet Report for %s" % self.host + p.puts "To: " + emails.join(", ") - p.puts messages - end + p.puts messages end end rescue => detail @@ -176,12 +172,5 @@ Puppet::Reports.register_report(:tagmail) do # Don't bother waiting for the pid to return. Process.detach(pid) end - - def sync - unless defined?(@sync) - @sync = Sync.new - end - @sync - end end |