From f4801651ebaf6b0e0cf5b96105f4af750d94fd05 Mon Sep 17 00:00:00 2001 From: Frederico Araujo Date: Wed, 18 Jan 2012 23:07:00 +0700 Subject: [PATCH] Issue #2688 Remove hoptoad_notifier and use airbreak --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- config/application.yml.example | 4 ++-- config/deploy.rb | 2 +- config/initializers/airbreak.rb | 6 ++++++ config/initializers/hoptoad.rb | 5 ----- 6 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 config/initializers/airbreak.rb delete mode 100644 config/initializers/hoptoad.rb diff --git a/Gemfile b/Gemfile index 7f0ba8430..e4b7b7f30 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'messagebus_ruby_api', '1.0.1' group :production do # we don't install these on travis to speed up test runs # reporting - gem 'hoptoad_notifier' + gem 'airbrake' gem 'newrelic_rpm' gem 'rack-google-analytics', :require => 'rack/google-analytics' gem 'rack-piwik', :require => 'rack/piwik' diff --git a/Gemfile.lock b/Gemfile.lock index fd70d6ccc..10caf6306 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,6 +89,9 @@ GEM activesupport (>= 3.0.0) rack (>= 1.1.0) addressable (2.2.4) + airbrake (3.0.9) + activesupport + builder archive-tar-minitar (0.5.2) arel (2.0.10) bcrypt-ruby (2.1.4) @@ -198,9 +201,6 @@ GEM heroku (>= 2) rails (>= 2) highline (1.6.9) - hoptoad_notifier (2.4.11) - activesupport - builder i18n (0.5.0) i18n-inflector (2.6.3) i18n (>= 0.4.1) @@ -420,6 +420,7 @@ DEPENDENCIES acts-as-taggable-on! acts_as_api addressable (= 2.2.4) + airbrake bundler (>= 1.0.0) capistrano (~> 2.9.0) capistrano-ext (= 1.2.1) @@ -446,7 +447,6 @@ DEPENDENCIES haml heroku heroku_san - hoptoad_notifier http_accept_language! i18n-inflector-rails (~> 1.0) jammit (= 0.6.5) diff --git a/config/application.yml.example b/config/application.yml.example index 4eadcf13c..60ba35d38 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -93,8 +93,8 @@ defaults: &defaults # Enable extensive logging to websocket server. socket_debug : false - # Hoptoad api key, send failures to Hoptoad - hoptoad_api_key: '' + # Airbreak api key, send failures to http://projectname.airbreak.io/ (Former Hoptoad) + airbreak_api_key: '' #social media setup facebook_app_id: '' diff --git a/config/deploy.rb b/config/deploy.rb index 44ab9053c..8d811d5d9 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -7,7 +7,7 @@ set :config_yaml, YAML.load_file(File.dirname(__FILE__) + '/deploy_config.yml') require './config/cap_colors' require 'bundler/capistrano' require './config/boot' -require 'hoptoad_notifier/capistrano' +require 'airbrake/capistrano' set :bundle_dir, '' set :stages, ['production', 'staging'] diff --git a/config/initializers/airbreak.rb b/config/initializers/airbreak.rb new file mode 100644 index 000000000..dd7a58e11 --- /dev/null +++ b/config/initializers/airbreak.rb @@ -0,0 +1,6 @@ +# (Former Hoptoad) +if AppConfig[:airbreak_api_key].present? + Airbrake.configure do |config| + config.api_key = AppConfig[:airbreak_api_key] + end +end diff --git a/config/initializers/hoptoad.rb b/config/initializers/hoptoad.rb deleted file mode 100644 index 7b219921b..000000000 --- a/config/initializers/hoptoad.rb +++ /dev/null @@ -1,5 +0,0 @@ -if AppConfig[:hoptoad_api_key].present? - HoptoadNotifier.configure do |config| - config.api_key = AppConfig[:hoptoad_api_key] - end -end