Use "abort" instead of "exit" in order to make error log more informative (# 26791).

git-svn-id: http://svn.redmine.org/redmine/trunk@17668 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb
index 6ca65304cf9f3c6fc7f434d29a0a5a974daec700..8d96749e1e081f6a60ef6f6a1b82d8b46ddea348 100644 (file)
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
@@ -56,9 +56,8 @@ module Redmine
             # Comprehensive error message for those who used async_smtp and async_sendmail
             # delivery methods that are removed in Redmine 4.0.
             if k == 'delivery_method' && v.to_s =~ /\Aasync_(.+)/
-              $stderr.puts "Redmine now uses ActiveJob to send emails asynchronously and the :#{v} delivery method is no longer available.\n" +
+              abort "Redmine now uses ActiveJob to send emails asynchronously and the :#{v} delivery method is no longer available.\n" +
                 "Please update your config/configuration.yml to use :#$1 delivery method instead."
-              exit 1
             end
             v.symbolize_keys! if v.respond_to?(:symbolize_keys!)
             ActionMailer::Base.send("#{k}=", v)