Merge pull request coderwall#196 from just3ws/master

just3ws · just3ws · commit d7e20f9a1c08 · 2014-09-04T07:22:28.000-05:00
Added more logging and outer guard to the emails sender because some users have invalid emails
diff --git a/app/mailers/protip_mailer.rb b/app/mailers/protip_mailer.rb
@@ -16,7 +16,6 @@ class ProtipMailer < ActionMailer::Base
     endorsements: 'endorsements',
     protips_count: 'protips'
   }
-  ACTIVITY_SUBJECT_PREFIX = '[Coderwall]'
   CAMPAIGN_ID = 'protip_mailer-popular_protips'
 
   #################################################################################
diff --git a/app/workers/protip_mailer_popular_protips_worker.rb b/app/workers/protip_mailer_popular_protips_worker.rb
@@ -6,7 +6,17 @@ def perform(from, to)
     protips = ProtipMailer::Queries.popular_protips(from, to)
 
     User.find_each(batch_size: 100) do |user|
-      ProtipMailer.popular_protips(user, protips, from, to).deliver
+      begin
+        if REDIS.sismember(ProtipMailer::CAMPAIGN_ID, user.id.to_s)
+          Rails.logger.warn("Already sent email to #{user.id} please check Redis SET #{ProtipMailer::CAMPAIGN_ID}.")
+        else
+          Rails.logger.warn("Sending email to #{user.id}.")
+          ProtipMailer.popular_protips(user, protips, from, to).deliver
+        end
+      rescue => ex
+        Rails.logger.error("[ProtipMailer.popular_protips] Unable to send email due to '#{ex}' >>\n#{ex.backtrace.join("\n  ")}")
+        Rails.logger.ap([from, to, user, protips], :error)
+      end
     end
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ class ProtipMailer < ActionMailer::Base`
`16`	`16`	`endorsements: 'endorsements',`
`17`	`17`	`protips_count: 'protips'`
`18`	`18`	`}`
`19`		`- ACTIVITY_SUBJECT_PREFIX = '[Coderwall]'`
`20`	`19`	`CAMPAIGN_ID = 'protip_mailer-popular_protips'`
`21`	`20`
`22`	`21`	`#################################################################################`