From 7dbd07fdcc48d9570da5f8ab41facd2e6e7b2eeb Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 10 Sep 2019 23:10:19 +0300 Subject: [PATCH 1/3] Update `airbrake` gem --- Gemfile.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 45ceca8ab..6d11c266b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,9 +106,10 @@ GEM tzinfo (~> 1.1) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - airbrake (6.0.0) - airbrake-ruby (~> 2.0) - airbrake-ruby (2.0.0) + airbrake (9.4.3) + airbrake-ruby (~> 4.6) + airbrake-ruby (4.6.0) + rbtree3 (~> 0.5) akami (1.3.1) gyoku (>= 0.4.0) nokogiri @@ -336,6 +337,7 @@ GEM activesupport (>= 3.0) i18n polyamorous (~> 1.1) + rbtree3 (0.5.0) rdoc (4.3.0) regexp_parser (1.5.1) request_store (1.4.1) From 674f4d8a2010c17cdf6d7e8eba3e1935e816e8a4 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 10 Sep 2019 23:11:16 +0300 Subject: [PATCH 2/3] Remove `airbrake` gem monkey patches --- config/initializers/{errbit.rb => airbrake.rb} | 14 -------------- 1 file changed, 14 deletions(-) rename config/initializers/{errbit.rb => airbrake.rb} (51%) diff --git a/config/initializers/errbit.rb b/config/initializers/airbrake.rb similarity index 51% rename from config/initializers/errbit.rb rename to config/initializers/airbrake.rb index 3d4185834..f48529bc7 100644 --- a/config/initializers/errbit.rb +++ b/config/initializers/airbrake.rb @@ -1,17 +1,3 @@ -module Patches - module Airbrake - module SyncSender - def build_https(uri) - super.tap do |req| - req.verify_mode = OpenSSL::SSL::VERIFY_NONE - end - end - end - end -end - -Airbrake::SyncSender.prepend(::Patches::Airbrake::SyncSender) - Airbrake.configure do |config| config.host = ENV['airbrake_host'] config.project_id = ENV['airbrake_project_id'] From fb2e6978fd664a3f47765deac0ca98177da209b9 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 12 Sep 2019 16:36:36 +0300 Subject: [PATCH 3/3] Regenerate Airbrake config --- config/initializers/airbrake.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb index f48529bc7..917deb02a 100644 --- a/config/initializers/airbrake.rb +++ b/config/initializers/airbrake.rb @@ -2,7 +2,17 @@ Airbrake.configure do |config| config.host = ENV['airbrake_host'] config.project_id = ENV['airbrake_project_id'] config.project_key = ENV['airbrake_project_key'] - + config.root_directory = Rails.root + config.logger = + if ENV['RAILS_LOG_TO_STDOUT'].present? + Logger.new(STDOUT, level: Rails.logger.level) + else + Logger.new( + Rails.root.join('log', 'airbrake.log'), + level: Rails.logger.level + ) + end config.environment = ENV['airbrake_env'] || Rails.env - config.ignore_environments = %w(development test) + config.ignore_environments = %w[test] + config.blacklist_keys = Rails.application.config.filter_parameters end