Fix warnings on Rails boot (mastodon#16946)

jesseplusplus · Feb 10, 2022 · 9981be6 · 9981be6
1 parent 468ceb1
commit 9981be6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -81,7 +81,7 @@
     Bullet.bullet_logger = true
     Bullet.rails_logger  = false
 
-    Bullet.add_whitelist type: :n_plus_one_query, class_name: 'User', association: :account
+    Bullet.add_safelist type: :n_plus_one_query, class_name: 'User', association: :account
   end
 
   config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../lib/sidekiq_error_handler'
+
 Sidekiq.configure_server do |config|
   config.redis = REDIS_SIDEKIQ_PARAMS
 

diff --git a/app/lib/sidekiq_error_handler.rb → lib/sidekiq_error_handler.rb b/app/lib/sidekiq_error_handler.rb → lib/sidekiq_error_handler.rb
@@ -17,10 +17,8 @@ def call(*)
 
   private
 
-  # rubocop:disable Naming/MethodParameterName
-  def limit_backtrace_and_raise(e)
-    e.set_backtrace(e.backtrace.first(BACKTRACE_LIMIT))
-    raise e
+  def limit_backtrace_and_raise(exception)
+    exception.set_backtrace(exception.backtrace.first(BACKTRACE_LIMIT))
+    raise exception
   end
-  # rubocop:enable Naming/MethodParameterName
 end