From fe71548844715d796b9a6d2dd5234f70cf080f13 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 27 Dec 2021 00:47:20 +0100
Subject: Fix warnings on Rails boot (#16946)

---
 app/lib/sidekiq_error_handler.rb   | 26 --------------------------
 config/environments/development.rb |  2 +-
 config/initializers/sidekiq.rb     |  2 ++
 lib/sidekiq_error_handler.rb       | 24 ++++++++++++++++++++++++
 4 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 app/lib/sidekiq_error_handler.rb
 create mode 100644 lib/sidekiq_error_handler.rb

diff --git a/app/lib/sidekiq_error_handler.rb b/app/lib/sidekiq_error_handler.rb
deleted file mode 100644
index ab555b1be..000000000
--- a/app/lib/sidekiq_error_handler.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class SidekiqErrorHandler
-  BACKTRACE_LIMIT = 3
-
-  def call(*)
-    yield
-  rescue Mastodon::HostValidationError
-    # Do not retry
-  rescue => e
-    limit_backtrace_and_raise(e)
-  ensure
-    socket = Thread.current[:statsd_socket]
-    socket&.close
-    Thread.current[:statsd_socket] = nil
-  end
-
-  private
-
-  # rubocop:disable Naming/MethodParameterName
-  def limit_backtrace_and_raise(e)
-    e.set_backtrace(e.backtrace.first(BACKTRACE_LIMIT))
-    raise e
-  end
-  # rubocop:enable Naming/MethodParameterName
-end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d76361c60..de8762ff7 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -81,7 +81,7 @@ Rails.application.configure do
     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
index 219554df4..19a705ce8 100644
--- 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/lib/sidekiq_error_handler.rb b/lib/sidekiq_error_handler.rb
new file mode 100644
index 000000000..358afd540
--- /dev/null
+++ b/lib/sidekiq_error_handler.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class SidekiqErrorHandler
+  BACKTRACE_LIMIT = 3
+
+  def call(*)
+    yield
+  rescue Mastodon::HostValidationError
+    # Do not retry
+  rescue => e
+    limit_backtrace_and_raise(e)
+  ensure
+    socket = Thread.current[:statsd_socket]
+    socket&.close
+    Thread.current[:statsd_socket] = nil
+  end
+
+  private
+
+  def limit_backtrace_and_raise(exception)
+    exception.set_backtrace(exception.backtrace.first(BACKTRACE_LIMIT))
+    raise exception
+  end
+end
-- 
cgit