Tidy up store includes

rails · Sep 26, 2023 · c9c3231 · c9c3231
1 parent 2a06413
commit c9c3231
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/lib/solid_cache/store.rb b/lib/solid_cache/store.rb
@@ -1,12 +1,6 @@
 module SolidCache
  class Store < ActiveSupport::Cache::Store
- DEFAULT_ERROR_HANDLER = -> (method:, returning:, exception:) do
- if logger
- logger.error { "SolidCacheStore: #{method} failed, returned #{returning.inspect}: #{exception.class}: #{exception.message}" }
- end
- end
-
- include Api, Entries, Failsafe, Clusters
+ include Api, Clusters, Entries, Failsafe
  prepend ActiveSupport::Cache::Strategy::LocalCache
 
  def self.supports_cache_versioning?

diff --git a/lib/solid_cache/store/api.rb b/lib/solid_cache/store/api.rb
@@ -10,7 +10,6 @@ def initialize(options = {})
  super(options)
 
  @max_key_bytesize = options.fetch(:max_key_bytesize, DEFAULT_MAX_KEY_BYTESIZE)
- @error_handler = options.fetch(:error_handler, DEFAULT_ERROR_HANDLER)
  end
 
  def delete_matched(matcher, options = {})

diff --git a/lib/solid_cache/store/failsafe.rb b/lib/solid_cache/store/failsafe.rb
@@ -1,6 +1,12 @@
 module SolidCache
  class Store
  module Failsafe
+ DEFAULT_ERROR_HANDLER = -> (method:, returning:, exception:) do
+ if Store.logger
+ Store.logger.error { "SolidCacheStore: #{method} failed, returned #{returning.inspect}: #{exception.class}: #{exception.message}" }
+ end
+ end
+
  def initialize(options = {})
  super(options)