Commit 6c31900a authored by maeda's avatar maeda

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


git-svn-id: https://svn.redmine.org/redmine/trunk@17668 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 8ecfae7a
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment