sqeduler 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9331eead88bcd85bcd8e564ce22b5de81b3a43ee
-  data.tar.gz: b2ae466592349be888d1ff930f344e1b32702587
+  metadata.gz: 6bf402d8f9a9fa71478dbaf7d240c132e0eebb07
+  data.tar.gz: b372b39855ad6c9c1cd65815cb3b9b1215248bf7
 SHA512:
-  metadata.gz: 0b7af459f6a789931ad6a078650449e3efe51641f3b863206a9c99283740bb636010ecc581abd946027773f14fa16f820f1fb6df2cfb90b9476b8f9c2a913109
-  data.tar.gz: 416c4d0f6c7059fbd40e5aeb8495b46c25f67f919e314196c1df4a8313dd0475d6ea159c229dede39015b282f9ce987c7078bdbf9894494704096412caf47019
+  metadata.gz: 9b4352281ee3d6bb49b2c802e6d254f02c6d89ae3224149877bc2db6cd35ff60ac4a0201b824aef0b37b6825fd6e280d0a988c5993085c75e7a17440bb17905a
+  data.tar.gz: 7c1fdb476cd81993adb418188d3fb6cec45f625c4a96ac842ff5fbe92cc87d4109aac4e30cbb45d27ff45a7bb1e215691769c82647bdf5a2702b215565ddd4d3

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.3.1 / 2016-02-17
+
+* Fixed lock refresh checking timeout rather than expiration for finding eligible jobs
+
 ### 0.3.0 / 2016-01-25
 
 * Added lock refresh to maintain exclusive locks until long running jobs finish

data/lib/sqeduler/lock_maintainer.rb

@@ -63,7 +63,7 @@ module Sqeduler
       klass = class_name.constantize
       if klass.respond_to?(:synchronize_jobs_mode)
         # We only care about exclusive jobs that are long running
-        if klass.synchronize_jobs_mode == :one_at_a_time && klass.synchronize_jobs_timeout >= RUN_INTERVAL
+        if klass.synchronize_jobs_mode == :one_at_a_time && klass.synchronize_jobs_expiration >= RUN_INTERVAL
           return @class_with_locks[class_name] = klass
         end
       end

data/lib/sqeduler/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sqeduler
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

data/spec/lock_maintainer_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Sqeduler::LockMaintainer do
       Class.new do
         include Sidekiq::Worker
         prepend Sqeduler::Worker::Synchronization
-        synchronize :one_at_a_time, :expiration => 300, :timeout => 30
+        synchronize :one_at_a_time, :expiration => 300, :timeout => 5
 
         def perform(*_args)
           yield
@@ -18,6 +18,19 @@ RSpec.describe Sqeduler::LockMaintainer do
       end
     )
 
+    stub_const(
+      "SyncShortWorker",
+      Class.new do
+        include Sidekiq::Worker
+        prepend Sqeduler::Worker::Synchronization
+        synchronize :one_at_a_time, :expiration => 5, :timeout => 5
+
+        def perform
+          fail "This shouldn't be called"
+        end
+      end
+    )
+
     stub_const(
       "SyncWhateverWorker",
       Class.new do
@@ -75,6 +88,17 @@ RSpec.describe Sqeduler::LockMaintainer do
             }
           }
         ],
+        [
+          "process-key",
+          "worker-tid-6789",
+          {
+            "run_at" => run_at,
+            "payload" => {
+              "class" => "SyncShortWorker",
+              "args" => job_args
+            }
+          }
+        ],
         [
           "process-key",
           "worker-tid-4321",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqeduler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jared Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq