Don't insert middleware at all if they've been disabled

honeybadger-io · May 23, 2024 · 3acd8ef · 3acd8ef
1 parent 89f9798
commit 3acd8ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/honeybadger/init/rails.rb b/lib/honeybadger/init/rails.rb
@@ -12,9 +12,11 @@ class Railtie < ::Rails::Railtie
         end
 
         initializer 'honeybadger.install_middleware' do |app|
+          honeybadger_config = Honeybadger::Agent.instance.config
+
           app.config.middleware.insert(0, Honeybadger::Rack::ErrorNotifier)
-          app.config.middleware.insert_before(Honeybadger::Rack::ErrorNotifier, Honeybadger::Rack::UserInformer)
-          app.config.middleware.insert_before(Honeybadger::Rack::ErrorNotifier, Honeybadger::Rack::UserFeedback)
+          app.config.middleware.insert_before(Honeybadger::Rack::ErrorNotifier, Honeybadger::Rack::UserInformer) if honeybadger_config[:'user_informer.enabled']
+          app.config.middleware.insert_before(Honeybadger::Rack::ErrorNotifier, Honeybadger::Rack::UserFeedback) if honeybadger_config[:'feedback.enabled']
         end
 
         config.before_initialize do

diff --git a/lib/honeybadger/rack/user_feedback.rb b/lib/honeybadger/rack/user_feedback.rb
@@ -27,7 +27,6 @@ def initialize(app, agent = nil)
       end
 
       def call(env)
-        return @app.call(env) unless config[:'feedback.enabled']
         status, headers, body = @app.call(env)
         if env['honeybadger.error_id'] && form = render_form(env['honeybadger.error_id'])
           new_body = []

diff --git a/lib/honeybadger/rack/user_informer.rb b/lib/honeybadger/rack/user_informer.rb
@@ -17,7 +17,6 @@ def replacement(with)
       end
 
       def call(env)
-        return @app.call(env) unless config[:'user_informer.enabled']
         status, headers, body = @app.call(env)
         if env['honeybadger.error_id']
           new_body = []