From 78840d4acacc82c828b5f6933546df10aacbc2ac Mon Sep 17 00:00:00 2001 From: Luca Guidi Date: Tue, 28 Mar 2017 13:56:22 +0200 Subject: [PATCH] Reuse old mailer configuration when code reloading is active. Closes #751 --- lib/hanami/components/components.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/hanami/components/components.rb b/lib/hanami/components/components.rb index ab90a83be..366005fe3 100644 --- a/lib/hanami/components/components.rb +++ b/lib/hanami/components/components.rb @@ -183,7 +183,10 @@ module Components # rubocop:disable Metrics/ModuleLength resolve do |configuration| unless configuration.mailer.nil? - Hanami::Mailer.configuration = Hanami::Mailer::Configuration.new if Hanami.code_reloading? + if Hanami.code_reloading? && !Hanami::Mailer.configuration.nil? + Hanami::Mailer.configuration = Hanami::Mailer.configuration.dup + end + Hanami::Mailer.configure(&configuration.mailer) Hanami::Mailer.configuration end