mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
parent
41abebcbce
commit
a01488ae67
@ -1,7 +1,9 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
if GlobalSetting.skip_redis?
|
if GlobalSetting.skip_redis?
|
||||||
Rails.logger = Rails.logger.chained.first
|
if Rails.logger.respond_to? :chained
|
||||||
|
Rails.logger = Rails.logger.chained.first
|
||||||
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -142,6 +144,8 @@ RailsMultisite::ConnectionManagement.each_connection do
|
|||||||
end
|
end
|
||||||
|
|
||||||
if Rails.configuration.multisite
|
if Rails.configuration.multisite
|
||||||
chained = Rails.logger.chained
|
if Rails.logger.respond_to? :chained
|
||||||
chained && chained.first.formatter = RailsMultisite::Formatter.new
|
chained = Rails.logger.chained
|
||||||
|
chained && chained.first.formatter = RailsMultisite::Formatter.new
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
@ -26,9 +26,9 @@ task 'db:force_skip_persist' do
|
|||||||
GlobalSetting.skip_redis = true
|
GlobalSetting.skip_redis = true
|
||||||
end
|
end
|
||||||
|
|
||||||
task 'db:create' do |_, args|
|
task 'db:create' => [:load_config] do |_, args|
|
||||||
if MultisiteTestHelpers.load_multisite?
|
if !ENV['RAILS_ENV']
|
||||||
system("RAILS_DB=discourse_test_multisite rake db:create")
|
system("RAILS_ENV=test RAILS_DB=discourse_test_multisite rake db:create")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user