sync_machine 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 582b683ceda765fc486ebbe449206c61ad2aceded9e1f0cdc68a023510f4ebbb
-  data.tar.gz: 4145f8fca67cca0a36dbde2b7302333d0f3da6c8aa56ef0bf00106b49f45f5b6
+  metadata.gz: 53bfe80eb63e66b2764f6ccdd57c7d95d9b2b67df13fdcf3d992c9556e5f64c9
+  data.tar.gz: ccd13ca9080c464e9d599caa28949cbadb59924b6e94928941d16ea25aee6cd3
 SHA512:
-  metadata.gz: 06cbe6d8e456c10ae14466501f7995be45f58b43dcf3b4b51c7cb1f0cbca1888d9eff76d12790ac17867ce551431734348cfdd6c728f44f1316d70482ded446a
-  data.tar.gz: c188d5bc1baa7c74dd9a4dc947ca8df7cdd41e823ac4577dd46265dc3607d2d79200b8f79985d44c1d9e1e0bf0eb565a507445f98ee99b52ac85eeadc121b064
+  metadata.gz: d029ef1220e5a3e5cbe546538b6e79f7dd49e75963adea2b81baf49124e2f3caa4f82338df9184afdba23944afb045953f5cb5c282faad049acc76ec9c993acc
+  data.tar.gz: 67d93ffb472622004342343b36c300a80f8a1a28c894fcf8eb9d0c03fd1401c8845b6eda28d9d572f5cbb5ecca76955736ed3a2e559d2c14d37a97a0d71a7e4e

data/Gemfile.mongoid6-activesupport5.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sync_machine (1.2.0)
+    sync_machine (1.3.0)
       activesupport
       sidekiq
       wisper
@@ -58,11 +58,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    sidekiq (5.2.7)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.0.3)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
     sqlite3 (1.4.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)

data/Gemfile.mongoid7.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sync_machine (1.2.0)
+    sync_machine (1.3.0)
       activesupport
       sidekiq
       wisper

data/lib/sync_machine.rb

@@ -6,6 +6,7 @@ require "sync_machine/ensure_publication"
 require "sync_machine/ensure_publication_worker"
 require "sync_machine/find_subjects_worker"
 require "sync_machine/tracer_adapters"
+require "sync_machine/redis_lock"
 require "sync_machine/orm_adapters"
 require "sync_machine/version"
 require "sync_machine/railtie" if defined?(Rails::Railtie)

data/lib/sync_machine/ensure_publication/deduper.rb

@@ -13,23 +13,15 @@ module SyncMachine
       end
 
       def dedupe
-        if acquire_lock
-          begin
-            yield unless performed_since_enqueue_time?
-          ensure
-            Redis.current.del(redis_lock)
-          end
-        else
-          @job_class.perform_in(1 + rand(10), @subject_id, @enqueue_time_str)
+        lock = RedisLock.new("#{@job_class.name}:#{@subject_id}")
+        lock.acquire do
+          yield unless performed_since_enqueue_time?
         end
+        lock.acquired? || reschedule_job
       end
 
       private
 
-      def acquire_lock
-        Redis.current.set(redis_lock, "true", nx: true, ex: 10.minutes)
-      end
-
       def enqueue_time
         @enqueue_time ||= Time.parse(@enqueue_time_str)
       end
@@ -38,8 +30,8 @@ module SyncMachine
         @last_job_finished_at && @last_job_finished_at > enqueue_time
       end
 
-      def redis_lock
-        "#{@job_class.name}:#{@subject_id}"
+      def reschedule_job
+        @job_class.perform_in(1 + rand(10), @subject_id, @enqueue_time_str)
       end
     end
   end

data/lib/sync_machine/redis_lock.rb

@@ -0,0 +1,31 @@
+module SyncMachine
+  # General-purpose class for locking via Redis.
+  class RedisLock
+    def initialize(redis_key)
+      @redis_key = redis_key
+      @acquired = false
+    end
+
+    def acquire(&block)
+      yield_and_release(block) if set_redis_key
+    end
+
+    def acquired?
+      @acquired
+    end
+
+    private
+
+    def set_redis_key
+      @acquired = Redis.current.set(
+        @redis_key, "true", nx: true, ex: 10.minutes
+      )
+    end
+
+    def yield_and_release(block)
+      block.call
+    ensure
+      Redis.current.del(@redis_key)
+    end
+  end
+end

data/lib/sync_machine/version.rb

@@ -1,3 +1,3 @@
 module SyncMachine
-  VERSION = "1.3.0".freeze
+  VERSION = "1.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sync_machine
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Francis Hwang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -268,6 +268,7 @@ files:
 - lib/sync_machine/orm_adapters/active_record_adapter.rb
 - lib/sync_machine/orm_adapters/mongoid_adapter.rb
 - lib/sync_machine/railtie.rb
+- lib/sync_machine/redis_lock.rb
 - lib/sync_machine/tracer_adapters.rb
 - lib/sync_machine/tracer_adapters/open_tracing_adapter.rb
 - lib/sync_machine/version.rb