From a01488ae67a6761f4e1c1d79b7d625b254248b59 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 14 Jun 2019 15:05:29 +1000
Subject: [PATCH] DEV: improve on rake db:create

Followup on 3af00a65 which broke build
---
 config/initializers/100-logster.rb | 10 +++++++---
 lib/tasks/db.rake                  |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb
index 3fd4778b91..06e6ba66b9 100644
--- a/config/initializers/100-logster.rb
+++ b/config/initializers/100-logster.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 if GlobalSetting.skip_redis?
-  Rails.logger = Rails.logger.chained.first
+  if Rails.logger.respond_to? :chained
+    Rails.logger = Rails.logger.chained.first
+  end
   return
 end
 
@@ -142,6 +144,8 @@ RailsMultisite::ConnectionManagement.each_connection do
 end
 
 if Rails.configuration.multisite
-  chained = Rails.logger.chained
-  chained && chained.first.formatter = RailsMultisite::Formatter.new
+  if Rails.logger.respond_to? :chained
+    chained = Rails.logger.chained
+    chained && chained.first.formatter = RailsMultisite::Formatter.new
+  end
 end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index d55ecb6d3c..d14354d499 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -26,9 +26,9 @@ task 'db:force_skip_persist' do
   GlobalSetting.skip_redis = true
 end
 
-task 'db:create' do |_, args|
-  if MultisiteTestHelpers.load_multisite?
-    system("RAILS_DB=discourse_test_multisite rake db:create")
+task 'db:create' => [:load_config] do |_, args|
+  if !ENV['RAILS_ENV']
+    system("RAILS_ENV=test RAILS_DB=discourse_test_multisite rake db:create")
   end
 end