X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d8918f9ea40389c835f6a8d740d2ea95ddfceedb..4ed87e86c638523d093bc97b32715c4c6a41a70d:/cookbooks/chef/templates/default/report.rb.erb?ds=inline diff --git a/cookbooks/chef/templates/default/report.rb.erb b/cookbooks/chef/templates/default/report.rb.erb index 518ec1383..4265d0660 100644 --- a/cookbooks/chef/templates/default/report.rb.erb +++ b/cookbooks/chef/templates/default/report.rb.erb @@ -14,25 +14,32 @@ 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" + message_subject = "Chef run failed on #{node.name}" + message_body = "#{run_status.formatted_exception}\n" elsif elapsed_time > 600 - subject = "Chef run took #{elapsed_time} on #{node.name}" - message = "" + message_subject = "Chef run took #{elapsed_time} on #{node.name}" + message_body = "" end - return unless subject + return unless message_subject - message << Array(backtrace).join("\n") + message_body << Array(backtrace).join("\n") require "mail" + Mail.defaults do + delivery_method :exim, :location => "/usr/sbin/exim" + end + Mail.deliver do - to @config[:to] - from @config[:from] - subject subject - body message + to to_address + from from_address + subject message_subject + body message_body end end end