diff --git a/app/models/cron_mailer.rb b/app/models/cron_mailer.rb index 2b851c9..3f71b02 100644 --- a/app/models/cron_mailer.rb +++ b/app/models/cron_mailer.rb @@ -1,8 +1,8 @@ class CronMailer < ActionMailer::Base - def error_message(subject, message, sent_at= Time.now) + def info_message(recipients, subject, message, sent_at= Time.now) + @recipients = recipients @from = 'cronjob@allourideas.org' - @recipients = "dhruv@allourideas.org" @subject ="[All Our Ideas] " + subject @sent_on = sent_at @body[:message] = message diff --git a/app/views/cron_mailer/error_message.erb b/app/views/cron_mailer/error_message.erb index 98808e8..f8e02a2 100644 --- a/app/views/cron_mailer/error_message.erb +++ b/app/views/cron_mailer/error_message.erb @@ -1,6 +1,6 @@ Hi, -A cron job has sent an error message. Find the hopefully relevant message below: +A cron job has sent a message. Find the hopefully relevant message below: <%= @message %> diff --git a/app/views/cron_mailer/error_message.haml b/app/views/cron_mailer/error_message.haml deleted file mode 100644 index 99a503a..0000000 --- a/app/views/cron_mailer/error_message.haml +++ /dev/null @@ -1,11 +0,0 @@ -Hi, - -= "A cron job has sent an error message. Find the hopefully relevant message below:\n" - -= @message` - -Thanks, -All Our Ideas -145 Wallace Hall -Princeton, NJ 08544 -info@allourideas.org diff --git a/app/views/cron_mailer/info_message.erb b/app/views/cron_mailer/info_message.erb new file mode 100644 index 0000000..98808e8 --- /dev/null +++ b/app/views/cron_mailer/info_message.erb @@ -0,0 +1,11 @@ +Hi, + +A cron job has sent an error message. Find the hopefully relevant message below: + +<%= @message %> + +Thanks, +All Our Ideas +145 Wallace Hall +Princeton, NJ 08544 +info@allourideas.org diff --git a/config/initializers/mail.rb b/config/initializers/mail.rb index 6692c24..9ef6444 100644 --- a/config/initializers/mail.rb +++ b/config/initializers/mail.rb @@ -14,4 +14,5 @@ ActionMailer::Base.smtp_settings = { } DO_NOT_REPLY = "donotreply@example.com" - +CRON_EMAIL = "cron@allourideas.org" #Change to ENV +ERRORS_EMAIL = "errors@allourideas.org" #Change to ENV diff --git a/lib/tasks/test_api.rake b/lib/tasks/test_api.rake index 8cbc2b3..723484c 100644 --- a/lib/tasks/test_api.rake +++ b/lib/tasks/test_api.rake @@ -24,32 +24,31 @@ namespace :test_api do end end - if (2*total_wins != total_votes) - error_msg += "Error 1:" + error_msg += "Error 1: 2 x Total Wins != Total votes" error_bool= true end if(total_votes % 2 != 0) - error_msg += "Error 2:" + error_msg += "Error 2: Total votes is not Even!" error_bool= true end - if(total_votes != question.votes_count) - error_msg += "Error 3:" + if(total_votes != 2* question.votes_count) + error_msg += "Error 3: Total votes != 2 x # vote objects" error_bool = true end if error_bool error_msg += "Question #{question.id}: 2*wins = #{2*total_wins}, total votes = #{total_votes}, vote_count = #{question.votes_count}\n" end - error_bool = false - end - if error_msg - CronMailer.deliver_error_message("Data in api check error!", error_msg) + if error_msg.blank? + CronMailer.deliver_info_message(CRON_EMAIL, "Test of API Vote Consistency passed", "Examined #{questions.count} questions and found no irregulaties") + else + CronMailer.deliver_info_message("#{CRON_EMAIL},#{ERRORS_EMAIL}", "Error! Failure of API Vote Consistency " , error_msg) end end -- libgit2 0.21.2