throttle email notificatiions

Marcin Ciunelis · Sergey Nartimov
1 parent 2ee7c9db
Showing 4 changed files with 25 additions and 10 deletions Show diff stats
app/models/app.rb
app/models/notice.rb
app/models/notice_observer.rb
spec/controllers/apps_controller_spec.rb
@@ -103,6 +103,10 @@ class App
   end
   alias :notify_on_errs? :notify_on_errs
+  def notifiable?
+    notify_on_errs? && notification_recipients.any?
+  end
+
   def notify_on_deploys
     !(super == false)
   end
@@ -185,6 +189,10 @@ class App
     name <=> other.name
   end
+  def email_at_notices
+    Errbit::Config.per_app_email_at_notices ? read_attribute(:email_at_notices) : Errbit::Config.email_at_notices
+  end
+
   protected
     def store_cached_attributes_on_problems
@@ -94,6 +94,18 @@ class Notice
     backtrace_lines.in_app
   end
+  def similar_count
+    problem.notices_count
+  end
+
+  def notifiable?
+    app.email_at_notices.include?(similar_count)
+  end
+
+  def should_notify?
+    app.notifiable? && notifiable?
+  end
+
   protected
   def increase_counter_cache
@@ -7,16 +7,7 @@ class NoticeObserver &lt; Mongoid::Observer
       notice.app.notification_service.create_notification(notice.problem)
     end
-    if notice.app.notification_recipients.any?
-      Mailer.err_notification(notice).deliver
-    end
+    Mailer.err_notification(notice).deliver if notice.should_notify?
   end
-  private
-
-  def should_notify? notice
-    app = notice.app
-    app.notify_on_errs? and (app.notification_recipients.any? or !app.notification_service.nil?) and
-      (app.email_at_notices or Errbit::Config.email_at_notices).include?(notice.problem.notices_count)
-  end
 end
@@ -250,6 +250,10 @@ describe AppsController do
       end
       context "changing email_at_notices" do
+        before do
+          Errbit::Config.per_app_email_at_notices = true
+        end
+
         it "should parse legal csv values" do
           put :update, :id => @app.id, :app => { :email_at_notices => '1,   4,      7,8,  10' }
           @app.reload
	@@ -94,6 +94,18 @@ class Notice		@@ -94,6 +94,18 @@ class Notice
94	backtrace_lines.in_app	94	backtrace_lines.in_app
95	end	95	end
96		96
		97	+ def similar_count
		98	+ problem.notices_count
		99	+ end
		100	+
		101	+ def notifiable?
		102	+ app.email_at_notices.include?(similar_count)
		103	+ end
		104	+
		105	+ def should_notify?
		106	+ app.notifiable? && notifiable?
		107	+ end
		108	+
97	protected	109	protected
98		110
99	def increase_counter_cache	111	def increase_counter_cache
	@@ -7,16 +7,7 @@ class NoticeObserver < Mongoid::Observer		@@ -7,16 +7,7 @@ class NoticeObserver < Mongoid::Observer
7	notice.app.notification_service.create_notification(notice.problem)	7	notice.app.notification_service.create_notification(notice.problem)
8	end	8	end
9		9
10	- if notice.app.notification_recipients.any?
11	- Mailer.err_notification(notice).deliver
12	- end	10	+ Mailer.err_notification(notice).deliver if notice.should_notify?
13	end	11	end
14		12
15	- private
16	-
17	- def should_notify? notice
18	- app = notice.app
19	- app.notify_on_errs? and (app.notification_recipients.any? or !app.notification_service.nil?) and
20	- (app.email_at_notices or Errbit::Config.email_at_notices).include?(notice.problem.notices_count)
21	- end
22	end	13	end