X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ceb801ff008b6125d3a359635295f5091088f520..4ed87e86c638523d093bc97b32715c4c6a41a70d:/cookbooks/chef/templates/default/report.rb.erb?ds=sidebyside diff --git a/cookbooks/chef/templates/default/report.rb.erb b/cookbooks/chef/templates/default/report.rb.erb index 0317f9286..4265d0660 100644 --- a/cookbooks/chef/templates/default/report.rb.erb +++ b/cookbooks/chef/templates/default/report.rb.erb @@ -14,22 +14,33 @@ class Chef end def report + from_address = @config[:from] + to_address = @config[:to] + if failed? && !exception.is_a?(SystemExit) - subject = "Chef run failed on #{node.name}" - message = "#{run_status.formatted_exception}\n" - elsif elapsed_time > 300 - subject = "Chef run took #{elapsed_time} on #{node.name}" - message = "" + message_subject = "Chef run failed on #{node.name}" + message_body = "#{run_status.formatted_exception}\n" + elsif elapsed_time > 600 + message_subject = "Chef run took #{elapsed_time} on #{node.name}" + message_body = "" end - return unless subject + return unless message_subject + + message_body << Array(backtrace).join("\n") - message << Array(backtrace).join("\n") + require "mail" - require "pony" + Mail.defaults do + delivery_method :exim, :location => "/usr/sbin/exim" + end - Pony.mail(:to => @config[:to], :from => @config[:from], - :subject => subject, :body => message, :via => :smtp) + Mail.deliver do + to to_address + from from_address + subject message_subject + body message_body + end end end end