Merge branch 'master' into ingresses

3 files changed, 7 insertions, 7 deletions

diff --git a/lib/action_mailbox.rb b/lib/action_mailbox.rb
index 01cc38ec4a..ae37cb84ed 100644
--- a/lib/action_mailbox.rb
+++ b/lib/action_mailbox.rb
@@ -5,8 +5,6 @@ module ActionMailbox
 
   autoload :Base
   autoload :Router
-  autoload :Callbacks
-  autoload :Routing
 
   mattr_accessor :logger
   mattr_accessor :incinerate_after, default: 30.days
diff --git a/lib/action_mailbox/base.rb b/lib/action_mailbox/base.rb
index 3b12493662..30ecc4b623 100644
--- a/lib/action_mailbox/base.rb
+++ b/lib/action_mailbox/base.rb
@@ -50,7 +50,7 @@ class ActionMailbox::Base
       inbound_email.processing!
       yield
       inbound_email.delivered! unless inbound_email.bounced?
-    rescue => exception
+    rescue
       inbound_email.failed!
       raise
     end
diff --git a/lib/action_mailbox/routing.rb b/lib/action_mailbox/routing.rb
index b40e2774e4..d258b632f9 100644
--- a/lib/action_mailbox/routing.rb
+++ b/lib/action_mailbox/routing.rb
@@ -2,15 +2,17 @@ module ActionMailbox
   module Routing
     extend ActiveSupport::Concern
 
-    class_methods do
-      attr_reader :router
+    included do
+      cattr_accessor :router, default: ActionMailbox::Router.new
+    end
 
+    class_methods do
       def routing(routes)
-        (@router ||= ActionMailbox::Router.new).add_routes(routes)
+        router.add_routes(routes)
       end
 
       def route(inbound_email)
-        @router.route(inbound_email)
+        router.route(inbound_email)
       end
     end
   end