Use a PerThreadRegistry for the Blacklight connection and configuration

lib/blacklight.rb

@@ -10,6 +10,7 @@ module Blacklight
   autoload :Exceptions,  'blacklight/exceptions'
   autoload :Parameters,  'blacklight/parameters'
   autoload :Routes,      'blacklight/routes'
+  autoload :RuntimeRegistry, 'blacklight/runtime_registry'
   autoload :SearchBuilder, 'blacklight/search_builder'
   autoload :SearchState, 'blacklight/search_state'
   autoload :Solr, 'blacklight/solr'
@@ -26,7 +27,11 @@ def self.blacklight_config_file
   ##
   # The default index connection for the search index
   def self.default_index
-    repository_class.new(default_configuration)
+    Blacklight::RuntimeRegistry.connection ||= repository_class.new(default_configuration)
+  end
+
+  def self.default_index=(repository)
+    Blacklight::RuntimeRegistry.connection = repository
   end
 
   ##
@@ -52,10 +57,14 @@ def self.default_configuration
   end
 
   def self.connection_config
-    @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 ||= 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
+  end
+
+  def self.connection_config=(value)
+    Blacklight::RuntimeRegistry.connection_config = value
   end
 
   def self.blacklight_yml

lib/blacklight/runtime_registry.rb

@@ -0,0 +1,9 @@
+require 'active_support/per_thread_registry'
+
+module Blacklight
+  class RuntimeRegistry
+    extend ActiveSupport::PerThreadRegistry
+
+    attr_accessor :connection, :connection_config
+  end
+end