cachext 0.4.1 → 0.4.2.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee15ce5861491a60920fd817fe166da8f8557474
-  data.tar.gz: 99616c09308e8ca7d6f16fb02e2d4ae7cf3b0f60
+  metadata.gz: 26038adf65ec85eed32cecc1edd9385c11c68cc8
+  data.tar.gz: 7697ac15f9c7f5832915242a4a72375893780c25
 SHA512:
-  metadata.gz: 7356cdc28341bae97bba42b150700ae065bc833acf0e77122c5aae55c36c9a81ca830414f5d58bf27a0e7d279c2adebd514d2b8b97cd3d11d004f297dad096d7
-  data.tar.gz: 635116fce813c217dd61ce014f123db492f2c579f611b48238e739ca155bf2715f21e17d7323460af876cd85e127148b6448fe9197cbf1242ea5567dea49d018
+  metadata.gz: 408fcf3ed8969f0622edc7f594922c32419818126ee5f90ef86a933201d30c8ed954fda46c12f2e1fd5e413ca44b95839174455ce1248cbbad3c6f2bb0b6e31b
+  data.tar.gz: 448bfa70f2106b943a8ddd37de471b32642815fb0400f77ea739487dd4e568c95e10f99f8ca5092ee14f4005a9a91483af97253045754ccd2c862433b225318f

data/README.md

@@ -8,6 +8,7 @@ Extensions to normal Rails caching:
 
 * Lock (inspired by https://github.com/seamusabshere/lock_and_cache)
 * Backup
+* Circuit breaker
 
 ## Quickstart
 
@@ -119,6 +120,19 @@ Cachext.config.error_logger = nil
 
 If set to an object that responds to call, will `call` with any errors caught.
 
+```ruby
+Cachext.config.failure_threshold = 3
+```
+
+Number of tries before tripping circuit breaker.
+
+```ruby
+Cachext.config.breaker_timeout = 60
+```
+
+Time in seconds to wait before switching breaker to half-open.
+
+
 ## Usage
 
 ```ruby
@@ -129,11 +143,14 @@ Available options:
 
 * `expires_in`: override for the `default_expires_in`, in seconds
 * `default`: object or proc that will be used as the default if no backup is found
-* `errors`: override for the `default_errors` to be caught
-* `reraise_errors`: default `true`, if set to `false` NotFound errors will not
-  be raised
-* `not_found_error`: override for `not_found_errors`
-* `heartbeat_expires`: override for `heartbeat_expires`
+* `errors`: override for the `default_errors`: array of errors to catch and not reraise
+* `reraise_errors`: default `true`, if set to `false` NotFound errors will not be raised
+* `not_found_error`: (override) array of errors where we delete the backup and reraise
+* `heartbeat_expires`: (override) time in seconds for process heardbeat to expire
+* `failure_threshold`: (override) Number of tries before tripping circuit breaker
+* `breaker_timeout`: (override) time in seconds to wait before switching breaker to half-open
+* `cache`: use the first-level cache, defaults to true. If set to false, will always call the
+  fallback, but if an error is raised, will use the last known good value.
 
 ```ruby
 Cachext.multi key_base, ids, options, &block

data/cachext.gemspec

@@ -15,17 +15,14 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 4.2"
+  spec.add_dependency "faraday"
   spec.add_dependency "redis"
-  spec.add_dependency "redis-namespace"
   spec.add_dependency "redlock"
-  spec.add_dependency "faraday"
   spec.add_dependency "dalli"
 
+  spec.add_development_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

data/lib/cachext.rb

@@ -1,5 +1,4 @@
 require "cachext/version"
-require "faraday/error"
 
 module Cachext
   autoload :Breaker, "cachext/breaker"
@@ -50,7 +49,12 @@ module Cachext
   end
 
   def self.configure &block
+    @config_block = block
     @config = Configuration.setup(&block)
     @client = Client.new @config
   end
+
+  def self.forked!
+    configure(&@config_block)
+  end
 end

data/lib/cachext/breaker.rb

@@ -21,9 +21,9 @@ module Cachext
       end
 
       def increment_failure
-        redis.pipelined do
-          redis.set key_str(:last_failure), Time.now.to_f
-          redis.incr key_str(:monitor)
+        lock_redis.pipelined do
+          lock_redis.set key_str(:last_failure), Time.now.to_f
+          lock_redis.incr key_str(:monitor)
         end
       end
 
@@ -38,7 +38,7 @@ module Cachext
       end
 
       def reset!
-        redis.del key_str(:monitor),
+        lock_redis.del key_str(:monitor),
                   key_str(:health_check),
                   key_str(:last_failure)
       end
@@ -62,27 +62,27 @@ module Cachext
       end
 
       def monitor
-        redis.get(key_str(:monitor)).to_i
+        lock_redis.get(key_str(:monitor)).to_i
       end
 
       def last_failure
-        lf = redis.get key_str(:last_failure)
+        lf = lock_redis.get key_str(:last_failure)
         lf.nil? ? nil : lf.to_f
       end
 
       def health_check
-        redis.get(key_str(:health_check)).to_i
+        lock_redis.get(key_str(:health_check)).to_i
       end
 
       def increment_health_check
-        redis.incr key_str(:health_check)
+        lock_redis.incr key_str(:health_check)
       end
 
       def key_str(name)
-        "#{name}:#{key.raw.map(&:to_s).join(":")}"
+        "cachext:#{name}:#{key.raw.map(&:to_s).join(":")}"
       end
 
-      def redis
+      def lock_redis
         config.lock_redis
       end
     end

data/lib/cachext/client.rb

@@ -50,7 +50,7 @@ module Cachext
     end
 
     def write key, fresh, options
-      key.write fresh, expires_in: options.expires_in
+      key.write fresh, expires_in: options.expires_in if options.cache?
     end
   end
 end

data/lib/cachext/configuration.rb

@@ -1,6 +1,6 @@
 require "redlock"
-require "redis-namespace"
 require "thread"
+require "faraday/error"
 
 module Cachext
   class Configuration
@@ -59,7 +59,7 @@ module Cachext
     end
 
     def lock_redis
-      @lock_redis ||= Redis::Namespace.new :cachext, redis: redis
+      redis
     end
 
     def log_errors?
@@ -69,7 +69,7 @@ module Cachext
     def debug
       if block_given?
         if @debug
-          @mutex.synchronize do
+          @debug_mutex.synchronize do
             yield
           end
         end

data/lib/cachext/features/circuit_breaker.rb

@@ -11,7 +11,9 @@ module Cachext
       def read key, options
         circuit = breaker.for(key)
         if circuit.open?
-          key.read_backup
+          val = key.read_backup
+          debug_log { { m: :circuit_open, key: key, msg: "Circuit breaker open, reading from backup", val: val.inspect } }
+          val
         else
           circuit.check_health
           super

data/lib/cachext/features/lock.rb

@@ -19,7 +19,7 @@ module Cachext
       end
 
       def call_block key, options, &block
-        with_heartbeat_extender key.digest, options.heartbeat_expires do
+        with_heartbeat_extender key.lock_key, options.heartbeat_expires do
           super
         end
       end
@@ -46,17 +46,21 @@ module Cachext
       def obtain_lock key, options
         start_time = Time.now
 
-        until lock_info = @config.lock_manager.lock(key.digest, (options.heartbeat_expires * 1000).ceil)
-          wait_for_lock key, start_time
+        until lock_info ||= @config.lock_manager.lock(key.lock_key, (options.heartbeat_expires * 1000).ceil)
+          if wait_for_lock(key, start_time) == :timeout
+            lock_info = @config.lock_manager.lock(key.lock_key, (options.heartbeat_expires * 1000).ceil)
+            raise TimeoutWaitingForLock unless lock_info
+          end
         end
 
         lock_info
       end
 
       def wait_for_lock key, start_time
-        sleep rand(0..(@config.max_lock_wait / 2))
+        sleep rand(0.01..0.02)
+
         if Time.now - start_time > @config.max_lock_wait
-          raise TimeoutWaitingForLock
+          :timeout
         end
       end
     end

data/lib/cachext/key.rb

@@ -19,8 +19,12 @@ module Cachext
       [:backup_cache] + raw
     end
 
+    def lock_key
+      "cachext:lock:#{digest}"
+    end
+
     def locked?
-      lock_redis.exists digest
+      lock_redis.exists lock_key
     end
 
     def read

data/lib/cachext/multi.rb

@@ -106,7 +106,7 @@ module Cachext
 
       def lock_key_from_ids(ids)
         key = Key.new multi.key_base + ids
-        key.digest
+        key.lock_key
       end
 
       def write_cache records

data/lib/cachext/version.rb

@@ -1,3 +1,3 @@
 module Cachext
-  VERSION = "0.4.1"
+  VERSION = "0.4.2-alpha1"
 end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cachext
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2.pre.alpha1
 platform: ruby
 authors:
 - Donald Plummer
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: redis
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dalli
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -226,9 +212,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1