Don't try and restart passenger on machines that don't have it

[chef.git] / cookbooks / chef / templates / default / report.rb.erb

diff --git a/cookbooks/chef/templates/default/report.rb.erb b/cookbooks/chef/templates/default/report.rb.erb
index 6b8ec5b9c027cd23df9b9a602bb2139c2b2b228b..07a8753a8a4b4ed0bc0366f6111bf754d8e9d0fd 100644 (file)
--- a/cookbooks/chef/templates/default/report.rb.erb
+++ b/cookbooks/chef/templates/default/report.rb.erb
@@ -14,22 +14,29 @@ class Chef
       end
 
       def report
       end
 
       def report

+        from_address = @config[:from]
+        to_address = @config[:to]
+

         if failed? && !exception.is_a?(SystemExit)
         if failed? && !exception.is_a?(SystemExit)

-          subject = "Chef run failed on #{node.name}"
-          message = "#{run_status.formatted_exception}\n"
-        elsif elapsed_time > 600
-          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
 
         end
 

-        return unless subject
+        return unless message_subject

 
 

-        message << Array(backtrace).join("\n")
+        message_body << Array(backtrace).join("\n")

 
 

-        require "pony"
+        require "mail"

 
 

-        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
       end
     end
   end