github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 00:32:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Upgrade Rails to version 7.1

Browse Source 
---------

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
This commit is contained in:
Loïc Guitaut
2024-06-20 10:33:01 +02:00
committed by Loïc Guitaut
parent 706e074e6c
commit ce00f83173
48 changed files with 495 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/initializers/100-logster.rb
View File

@ -2,7 +2,7 @@
if GlobalSetting.skip_redis?
Rails.application.reloader.to_prepare do
Rails.logger = Rails.logger.chained.first if Rails.logger.respond_to? :chained
Rails.logger.stop_broadcasting_to(Logster.logger) if defined?(Logster::Logger) && Logster.logger
end
return
end
@ -10,12 +10,12 @@ end
if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
Rails.application.config.after_initialize do
console = ActiveSupport::Logger.new(STDOUT)
original_logger = Rails.logger.chained.first
original_logger = Rails.logger.broadcasts.first
console.formatter = original_logger.formatter
console.level = original_logger.level
unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT)
original_logger.extend(ActiveSupport::Logger.broadcast(console))
Rails.logger.broadcast_to(console)
end
end
end
@ -118,10 +118,7 @@ RailsMultisite::ConnectionManagement.each_connection do
end
if Rails.configuration.multisite
if Rails.logger.respond_to? :chained
chained = Rails.logger.chained
chained && chained.first.formatter = RailsMultisite::Formatter.new
end
Rails.logger.broadcasts.first.formatter = RailsMultisite::Formatter.new
end
Logster.config.project_directories = [