Download as
Browse Code »

Commit ed088890cffb2e093b780554225a8bcad5f69a5d

Authored by Cyril Mougel
2 parents 079a8ce8 fa63ff10
Exists in master and in 1 other branch production

Merge branch 'master' of github.com:errbit/errbit

Showing 11 changed files with 51 additions and 40 deletions   Show diff stats
app/interactors/problem_updater_cache.rb
  Diff comments   View file @ed08889
... ... @@ -43,8 +43,6 @@ class ProblemUpdaterCache
43 43 attrs[:last_notice_at] = last_notice.created_at if last_notice
44 44 attrs.merge!(
45 45 :message => notice.message,
46   - :environment => notice.environment_name,
47   - :error_class => notice.error_class,
48 46 :where => notice.where,
49 47 :messages => attribute_count(:message, messages),
50 48 :hosts => attribute_count(:host, hosts),
... ...
app/models/app.rb
  Diff comments   View file @ed08889
... ... @@ -42,11 +42,17 @@ class App
42 42 accepts_nested_attributes_for :notification_service, :allow_destroy => true,
43 43 :reject_if => proc { |attrs| !NotificationService.subclasses.map(&:to_s).include?(attrs[:type].to_s) }
44 44  
  45 + # Acceps a hash with the following attributes:
  46 + #
  47 + # * <tt>:error_class</tt> - the class of error (required to create a new Problem)
  48 + # * <tt>:environment</tt> - the environment the source app was running in (required to create a new Problem)
  49 + # * <tt>:fingerprint</tt> - a unique value identifying the notice
  50 + #
45 51 def find_or_create_err!(attrs)
46 52 Err.where(
47 53 :fingerprint => attrs[:fingerprint]
48 54 ).first ||
49   - problems.create!.errs.create!(attrs)
  55 + problems.create!(attrs.slice(:error_class, :environment)).errs.create!(attrs)
50 56 end
51 57  
52 58 # Mongoid Bug: find(id) on association proxies returns an Enumerator
... ...
app/models/err.rb
  Diff comments   View file @ed08889
... ... @@ -6,20 +6,16 @@ class Err
6 6 include Mongoid::Document
7 7 include Mongoid::Timestamps
8 8  
9   - field :error_class, :default => "UnknownError"
10   - field :component
11   - field :action
12   - field :environment, :default => "unknown"
13 9 field :fingerprint
14 10  
15   - belongs_to :problem
16 11 index :problem_id
17   - index :error_class
18 12 index :fingerprint
19 13  
  14 + belongs_to :problem
20 15 has_many :notices, :inverse_of => :err, :dependent => :destroy
21 16  
  17 + validates_presence_of :problem_id, :fingerprint
  18 +
22 19 delegate :app, :resolved?, :to => :problem
23 20  
24 21 end
25   -
... ...
app/models/error_report.rb
  Diff comments   View file @ed08889
... ... @@ -23,15 +23,9 @@ class ErrorReport
23 23 end
24 24  
25 25 def rails_env
26   - server_environment['environment-name'] || 'development'
27   - end
28   -
29   - def component
30   - request['component'] || 'unknown'
31   - end
32   -
33   - def action
34   - request['action']
  26 + rails_env = server_environment['environment-name']
  27 + rails_env = 'development' if rails_env.blank?
  28 + rails_env
35 29 end
36 30  
37 31 def app
... ... @@ -69,8 +63,6 @@ class ErrorReport
69 63 def error
70 64 @error ||= app.find_or_create_err!(
71 65 :error_class => error_class,
72   - :component => component,
73   - :action => action,
74 66 :environment => rails_env,
75 67 :fingerprint => fingerprint
76 68 )
... ...
app/models/problem.rb
  Diff comments   View file @ed08889
... ... @@ -39,6 +39,8 @@ class Problem
39 39 has_many :errs, :inverse_of => :problem, :dependent => :destroy
40 40 has_many :comments, :inverse_of => :err, :dependent => :destroy
41 41  
  42 + validates_presence_of :error_class, :environment
  43 +
42 44 before_create :cache_app_attributes
43 45  
44 46 scope :resolved, where(:resolved => true)
... ... @@ -91,11 +93,12 @@ class Problem
91 93 end
92 94  
93 95 def unmerge!
  96 + attrs = {:error_class => error_class, :environment => environment}
94 97 problem_errs = errs.to_a
95 98 problem_errs.shift
96 99 [self] + problem_errs.map(&:id).map do |err_id|
97 100 err = Err.find(err_id)
98   - app.problems.create.tap do |new_problem|
  101 + app.problems.create(attrs).tap do |new_problem|
99 102 err.update_attribute(:problem_id, new_problem.id)
100 103 new_problem.reset_cached_attributes
101 104 end
... ...
spec/fabricators/err_fabricator.rb
  Diff comments   View file @ed08889
1 1 Fabricator :err do
2 2 problem!
3   - error_class! { 'FooError' }
4   - component 'foo'
5   - action 'bar'
6   - environment 'production'
  3 + fingerprint 'some-finger-print'
7 4 end
8 5  
9 6 Fabricator :notice do
... ...
spec/fabricators/problem_fabricator.rb
  Diff comments   View file @ed08889
1 1 Fabricator(:problem) do
2 2 app! { Fabricate(:app) }
3 3 comments { [] }
  4 + error_class 'FooError'
  5 + environment 'production'
4 6 end
5 7  
6 8 Fabricator(:problem_with_comments, :from => :problem) do
... ...
spec/interactors/problem_updater_cache_spec.rb
  Diff comments   View file @ed08889
... ... @@ -27,8 +27,6 @@ describe ProblemUpdaterCache do
27 27  
28 28 it 'update information about this notice' do
29 29 expect(problem.message).to eq notice.message
30   - expect(problem.environment).to eq notice.environment_name
31   - expect(problem.error_class).to eq notice.error_class
32 30 expect(problem.where).to eq notice.where
33 31 end
34 32  
... ... @@ -68,8 +66,6 @@ describe ProblemUpdaterCache do
68 66 end
69 67 it 'update information about this notice' do
70 68 expect(problem.message).to eq notice.message
71   - expect(problem.environment).to eq notice.environment_name
72   - expect(problem.error_class).to eq notice.error_class
73 69 expect(problem.where).to eq notice.where
74 70 end
75 71  
... ... @@ -118,8 +114,6 @@ describe ProblemUpdaterCache do
118 114  
119 115 it 'update information about this notice' do
120 116 expect(problem.message).to eq notice.message
121   - expect(problem.environment).to eq notice.environment_name
122   - expect(problem.error_class).to eq notice.error_class
123 117 expect(problem.where).to eq notice.where
124 118 end
125 119  
... ...
spec/models/app_spec.rb
  Diff comments   View file @ed08889
... ... @@ -162,9 +162,8 @@ describe App do
162 162 @app = Fabricate(:app)
163 163 @conditions = {
164 164 :error_class => 'Whoops',
165   - :component => 'Foo',
166   - :action => 'bar',
167   - :environment => 'production'
  165 + :environment => 'production',
  166 + :fingerprint => 'some-finger-print'
168 167 }
169 168 end
170 169  
... ...
spec/models/err_spec.rb
  Diff comments   View file @ed08889
1 1 require 'spec_helper'
2 2  
3 3 describe Err do
4   - it 'sets a default error_class and environment' do
5   - err = Err.new
6   - err.error_class.should == "UnknownError"
7   - err.environment.should == "unknown"
  4 +
  5 + context 'validations' do
  6 + it 'requires a fingerprint' do
  7 + err = Fabricate.build(:err, :fingerprint => nil)
  8 + err.should_not be_valid
  9 + err.errors[:fingerprint].should include("can't be blank")
  10 + end
  11 +
  12 + it 'requires a problem' do
  13 + err = Fabricate.build(:err, :problem_id => nil)
  14 + err.should_not be_valid
  15 + err.errors[:problem_id].should include("can't be blank")
  16 + end
8 17 end
9   -end
10 18  
  19 +end
... ...
spec/models/problem_spec.rb
  Diff comments   View file @ed08889
1 1 require 'spec_helper'
2 2  
3 3 describe Problem do
  4 +
  5 + context 'validations' do
  6 + it 'requires a error_class' do
  7 + err = Fabricate.build(:problem, :error_class => nil)
  8 + err.should_not be_valid
  9 + err.errors[:error_class].should include("can't be blank")
  10 + end
  11 +
  12 + it 'requires an environment' do
  13 + err = Fabricate.build(:problem, :environment => nil)
  14 + err.should_not be_valid
  15 + err.errors[:environment].should include("can't be blank")
  16 + end
  17 + end
  18 +
4 19 describe "Fabrication" do
5 20 context "Fabricate(:problem)" do
6 21 it 'should have no comment' do
... ...