Turn on/off email notifications for deploys and errors on a per-application basi…

…s. Allow message with deploy notifications (so we know what is was for)

Turn on/off email notifications for deploys and errors on a per-application basi…
…s. Allow message with deploy notifications (so we know what is was for)
Raja Bhadury
1 parent 11173e81
Showing 8 changed files with 23 additions and 4 deletions Show diff stats
app/controllers/deploys_controller.rb
app/models/app.rb
app/models/deploy.rb
app/models/err.rb
app/models/notice.rb
app/views/apps/_fields.html.haml
app/views/apps/show.html.haml
app/views/deploys/_table.html.haml
 class DeploysController < ApplicationController
+
+  protect_from_forgery :except => :create
   skip_before_filter :verify_authenticity_token, :only => :create
   skip_before_filter :authenticate_user!, :only => :create
@@ -9,7 +11,8 @@ class DeploysController &lt; ApplicationController
       :username     => params[:deploy][:local_username],
       :environment  => params[:deploy][:rails_env],
       :repository   => params[:deploy][:scm_repository],
-      :revision     => params[:deploy][:scm_revision]
+      :revision     => params[:deploy][:scm_revision],
+      :message      => params[:deploy][:message]
     })
     render :xml => @deploy
   end
@@ -5,6 +5,8 @@ class App
   field :name, :type => String
   field :api_key
   field :resolve_errs_on_deploy, :type => Boolean, :default => false
+  field :notify_on_errs, :type => Boolean, :default => false
+  field :notify_on_deploys, :type => Boolean, :default => false
   key :name
   embeds_many :watchers
@@ -6,6 +6,7 @@ class Deploy
   field :repository
   field :environment
   field :revision
+  field :message
   index :created_at, Mongo::DESCENDING
@@ -27,7 +28,7 @@ class Deploy
   protected
     def should_notify?
-      app.watchers.any?
+      app.notify_on_deploys? && app.watchers.any?
     end
     def should_resolve_app_errs?
@@ -13,6 +13,7 @@ class Err
   field :resolved, :type => Boolean, :default => false
   index :last_notice_at
+  index :app_id
   referenced_in :app
   embeds_many :notices
@@ -73,7 +73,7 @@ class Notice
   protected
     def should_notify?
-      Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
+      err.app.notify_on_errs? && Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
     end
 end
 \ No newline at end of file
@@ -5,9 +5,17 @@
   = f.text_field :name
 %div.checkbox
+  = f.check_box :notify_on_errs
+  = f.label :notify_on_errs, 'Notify on errors'
+
+%div.checkbox
   = f.check_box :resolve_errs_on_deploy
   = f.label :resolve_errs_on_deploy, 'Resolve errs on deploy'
-  
+
+%div.checkbox
+  = f.check_box :notify_on_deploys
+  = f.label :notify_on_deploys, 'Notify on deploys'
+
 %fieldset.nested-wrapper
   %legend Watchers
   - f.fields_for :watchers do |w|
@@ -32,6 +32,7 @@
       %tr
         %th When
         %th Who
+        %th Message
         %th Repository
         %th Revision
@@ -40,6 +41,7 @@
         %tr
           %td.when #{deploy.created_at.to_s(:micro)}
           %td.who #{deploy.username}
+          %td.message #{deploy.message}
           %td.repository #{deploy.repository}
           %td.revision #{deploy.revision}
   = link_to "All Deploys (#{@app.deploys.count})", app_deploys_path(@app), :class => 'button'
@@ -4,6 +4,7 @@
       %th App
       %th When
       %th Who
+      %th Message
       %th Repository
       %th Revision
   %tbody
@@ -14,5 +15,6 @@
           %span.environment= deploy.environment
         %td.latest #{time_ago_in_words(deploy.created_at)} ago
         %td.who #{deploy.username}
+        %td.message #{deploy.message}
         %td.repository #{deploy.repository}
         %td.revision #{deploy.revision}
	@@ -13,6 +13,7 @@ class Err		@@ -13,6 +13,7 @@ class Err
13	field :resolved, :type => Boolean, :default => false	13	field :resolved, :type => Boolean, :default => false
14		14
15	index :last_notice_at	15	index :last_notice_at
		16	+ index :app_id
16		17
17	referenced_in :app	18	referenced_in :app
18	embeds_many :notices	19	embeds_many :notices
	@@ -73,7 +73,7 @@ class Notice		@@ -73,7 +73,7 @@ class Notice
73	protected	73	protected
74		74
75	def should_notify?	75	def should_notify?
76	- Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?	76	+ err.app.notify_on_errs? && Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
77	end	77	end
78		78
79	end	79	end
80	\ No newline at end of file	80	\ No newline at end of file