Merge pull request #304 from avinoth/master

mdeiters · mdeiters · commit 11ad45829e02 · 2015-01-23T09:46:34.000-08:00
remove airbrake, add bugsnag
diff --git a/Gemfile b/Gemfile
@@ -184,7 +184,7 @@ group :test do
   gem 'stripe-ruby-mock', git: 'https://github.com/rebelidealist/stripe-ruby-mock', branch: 'live-tests'
 end
 
-gem 'airbrake'
+gem 'bugsnag'
 group :production do
   gem 'newrelic_rpm'
   gem 'puma'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -86,9 +86,6 @@ GEM
     acts_as_commentable (2.0.1)
     acts_as_follower (0.1.1)
     addressable (2.3.6)
-    airbrake (4.1.0)
-      builder
-      multi_json
     annotate (2.6.5)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
@@ -120,6 +117,8 @@ GEM
       debug_inspector (>= 0.0.1)
     blankslate (3.1.3)
     buftok (0.2.0)
+    bugsnag (2.7.1)
+      multi_json (~> 1.0)
     builder (3.0.4)
     byebug (2.7.0)
       columnize (~> 0.3)
@@ -737,13 +736,13 @@ DEPENDENCIES
   acts-as-taggable-on (~> 3.4)
   acts_as_commentable (= 2.0.1)
   acts_as_follower (= 0.1.1)
-  airbrake
   annotate
   autoprefixer-rails
   awesome_print
   backbone-on-rails
   better_errors
   binding_of_caller
+  bugsnag
   capybara
   capybara-screenshot
   carrierwave
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -5,7 +5,6 @@ class AccountsController < ApplicationController
   before_action :ensure_account_admin, except: [:create]
   before_action :determine_plan, only: [:create, :update]
   before_action :ensure_eligibility, only: [:new]
-  before_action :paying_user_context, if: ->() { Rails.env.production? }
 
   def new
     @account ||= current_user.team.build_account
@@ -31,7 +30,6 @@ def create
       redirect_to new_team_opportunity_path(@team), notice: "You are subscribed to #{@plan.name}." + plan_capability(@plan, @team)
     else
       Rails.logger.error "Error creating account #{@account.errors.inspect}"
-      # Honeybadger.notify(error_class: 'Payments', error_message: @account.errors.full_messages.join("\n"), parameters: params) if Rails.env.production?
       flash[:error] = @account.errors.full_messages.join("\n")
       redirect_to employers_path
     end
@@ -103,10 +101,6 @@ def plan_capability(plan, team)
     message
   end
 
-  def paying_user_context
-    # Honeybadger.context(user_email: current_user.try(:email)) if current_user
-  end
-
   def account_params
     params.require(:teams_account).permit(:stripe_card_token)
   end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -42,18 +42,15 @@ def create
     end
   rescue Faraday::Error::ConnectionFailed => ex
     Rails.logger.error("Faraday::Error::ConnectionFailed => #{ex.message}, #{ex.inspect}")
-    # notify_honeybadger(ex) if Rails.env.production?
     record_event("error", message: "attempt to reuse a linked account")
     flash[:error] = "Error linking #{oauth[:info][:nickname]} because it is already associated with a different member."
     redirect_to(root_url)
   rescue ActiveRecord::RecordNotUnique => ex
-    # notify_honeybadger(ex) if Rails.env.production?
     record_event("error", message: "attempt to reuse a linked account")
     flash[:error] = "Error linking #{oauth[:info] && oauth[:info][:nickname]} because it is already associated with a different member."
     redirect_to(root_url)
   rescue Exception => ex
     Rails.logger.error("Failed to link account because #{ex.message} => '#{oauth}'")
-    # notify_honeybadger(ex) if Rails.env.production?
     record_event("error", message: "signup failure")
     flash[:notice] = "Looks like something went wrong. Please try again."
     redirect_to(root_url)
diff --git a/app/models/teams/account.rb b/app/models/teams/account.rb
@@ -45,12 +45,10 @@ def save_with_payment(plan=nil)
       return false
     end
   rescue Stripe::CardError => e
-    # Honeybadger.notify(e) if Rails.env.production?
     Rails.logger.error "Stripe error while creating customer: #{e.message}" if ENV['DEBUG']
     errors.add :base, e.message
     return false
   rescue Stripe::InvalidRequestError => e
-    # Honeybadger.notify(e) if Rails.env.production?
     Rails.logger.error "Stripe error while creating customer: #{e.message}"  if ENV['DEBUG']
     errors.add :base, "There was a problem with your credit card."
     # throw e if Rails.env.development?
diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb
diff --git a/config/initializers/bugsnag.rb b/config/initializers/bugsnag.rb
@@ -0,0 +1,9 @@
+if defined?(Bugsnag)
+  Bugsnag.configure do |config|
+    config.api_key = ENV['BUGSNAG_API_KEY']
+  end
+else
+  unless Rails.env.test? || Rails.env.development?
+    Rails.logger.warn '[WTF WARNING] Someone deleted bugsnag and forgot the initializer'
+  end
+end
diff --git a/spec/lib/omniauth_spec.rb b/spec/lib/omniauth_spec.rb
