From 7a50130462cd89fcecc3fc272e121271df116724 Mon Sep 17 00:00:00 2001
From: Chris Beer <chris@cbeer.info>
Date: Mon, 3 Oct 2022 15:32:30 -0700
Subject: [PATCH] Blacklight.connection_config shouldn't depend on
 blacklight.yml

---
 lib/blacklight.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/blacklight.rb b/lib/blacklight.rb
index 617b8c86ea..be19036560 100644
--- a/lib/blacklight.rb
+++ b/lib/blacklight.rb
@@ -58,11 +58,7 @@ def self.default_configuration
   end
 
   def self.connection_config
-    Blacklight::RuntimeRegistry.connection_config ||= begin
-      raise "The #{::Rails.env} environment settings were not found in the blacklight.yml config" unless blacklight_yml[::Rails.env]
-
-      blacklight_yml[::Rails.env].symbolize_keys
-    end
+    Blacklight::RuntimeRegistry.connection_config ||= blacklight_yml[::Rails.env]&.symbolize_keys if blacklight_yml?
   end
 
   def self.connection_config=(value)
@@ -84,7 +80,7 @@ def self.blacklight_yml
     require 'yaml'
 
     return @blacklight_yml if @blacklight_yml
-    unless File.exist?(blacklight_config_file)
+    unless blacklight_yml?
       raise "You are missing a configuration file: #{blacklight_config_file}. Have you run \"rails generate blacklight:install\"?"
     end
 
@@ -111,6 +107,10 @@ def self.blacklight_yml
     @blacklight_yml
   end
 
+  def self.blacklight_yml?
+    File.exist?(blacklight_config_file)
+  end
+
   def self.logger
     @logger ||= (::Rails.logger if defined? Rails && Rails.respond_to?(:logger))
   end