IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: improve on rake db:create

Browse Source 
Followup on 3af00a65 which broke build
This commit is contained in:
Sam Saffron 2019-06-14 15:05:29 +10:00
parent 41abebcbce
commit a01488ae67
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

6
lib/tasks/db.rake
View File

@ -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