2 files changed, 6 insertions, 2 deletions
diff --git a/lib/action_mailbox/base.rb b/lib/action_mailbox/base.rb
index 476c343415..ce1aec01a9 100644
--- a/lib/action_mailbox/base.rb
+++ b/lib/action_mailbox/base.rb
@@ -10,6 +10,8 @@ class ActionMailbox::Base
   attr_reader :inbound_email
   delegate :mail, :bounced!, to: :inbound_email
 
+  delegate :logger, to: ActionMailbox
+
   def self.receive(inbound_email)
     new(inbound_email).perform_processing
   end
@@ -32,7 +34,7 @@ class ActionMailbox::Base
   def process
     # Overwrite in subclasses
   end
-  
+
   private
     def track_status_of_inbound_email
       inbound_email.processing!
diff --git a/lib/action_mailbox/engine.rb b/lib/action_mailbox/engine.rb
index 92852a0fa3..4e800c54de 100644
--- a/lib/action_mailbox/engine.rb
+++ b/lib/action_mailbox/engine.rb
@@ -5,9 +5,11 @@ module ActionMailbox
     isolate_namespace ActionMailbox
     config.eager_load_namespaces << ActionMailbox
 
+    config.action_mailbox = ActiveSupport::OrderedOptions.new
+
     initializer "action_mailbox.config" do
       config.after_initialize do |app|
-        # Configure
+        ActionMailbox.logger = app.config.action_mailbox.logger || Rails.logger
       end
     end
   end