Merge branch 'hotfix/1.2.4' into develop

config/environments/production.rb

@@ -83,13 +83,16 @@ Rails.application.configure do
   config.log_formatter = ::Logger::Formatter.new
 
   # Use a different logger for distributed setups.
-  # require 'syslog/logger'
-  config.logger = ActiveSupport::Logger.new(Rails.root.join('log', Rails.env + '.log'), 1, ENV.fetch('LOG_SIZE', '1024').to_i.megabytes)
-
   if ENV['RAILS_LOG_TO_STDOUT'].present?
     logger           = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
+  else
+    config.logger    = ActiveSupport::Logger.new(
+      Rails.root.join('log', Rails.env + '.log'),
+      1,
+      ENV.fetch('LOG_SIZE', '1024').to_i.megabytes
+    )
   end
 
   # Do not dump schema after migrations.