sqeduler 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf3832836e43f9513299831abcce9bc67551ed1
-  data.tar.gz: eee3fc43d7e4d7aa106e7ff244f8029932feda94
+  metadata.gz: 285c8e84ead9c7c09c993c9dd758dde10dd1e9f1
+  data.tar.gz: 3fa620e267de5111437ed61a7993ea9e6ce9f248
 SHA512:
-  metadata.gz: e984434cc1cd0c5fbe44f34b85a1fa75d520d2de2e635a0ba3e848ad195dcc6015e0cf00495e2cc41fe30fdfcb3988cbf2e7aac7a5c24d547f6c6a95dc3d998d
-  data.tar.gz: c5cc39b2699fb6da450f3c8dd32c4da5eadd11775820b3420af024d1376598ca51f09a4fae376b60ef6761cb75fe3323a411ecebfcf7ef0a51b4df7cf582e9a8
+  metadata.gz: 18bed5ddc6ea2b8f34a5dd5817c49c9841912307a0dfe4e864dfae796e561a4e5e571132a20f4344ac8c049164795aa601b76dfe81232486c6801137d5a65825
+  data.tar.gz: 1fcfd239f05867d25212d83ba47c0fb28794d28799ffed3b7c4dafecca225af13c48373f321ad536424b1f73b45d69ed2609764bf9020b8f438ec5385c7e0558

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.3.3 / 2016-03-25
+
+* Fixed lock refresher not calling `redis_pool` properly so it wouldn't actually run
+
 ### 0.3.2 / 2016-03-10
 
 * Fixed lock refresher failing to lock properly for exclusive runs

data/lib/sqeduler/lock_maintainer.rb

@@ -39,7 +39,7 @@ module Sqeduler
     def synchronize
       now = Time.now.to_i
 
-      Service.redis_pool do |redis|
+      Service.redis_pool.with do |redis|
         redis.pipelined do
           workers.each do |_worker, _tid, args|
             # No sense in pinging if it's not been running long enough to matter

data/lib/sqeduler/version.rb

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

data/spec/lock_maintainer_spec.rb

@@ -58,6 +58,8 @@ RSpec.describe Sqeduler::LockMaintainer do
 
       run.join(1)
       run.terminate
+
+      expect(instance.send(:redis_lock).locked?).to eq(false)
     end
 
     it "doesn't die on errors" do
@@ -67,6 +69,16 @@ RSpec.describe Sqeduler::LockMaintainer do
       expect(run.status).to_not be_falsy
       run.terminate
     end
+
+    it "obeys the exclusive lock" do
+      lock = Sqeduler::RedisLock.new("sqeduler-lock-maintainer", :expiration => 60, :timeout => 0)
+      lock.lock
+
+      expect(instance).to_not receive(:synchronize)
+
+      run.join(1)
+      run.terminate
+    end
   end
 
   context "#synchronize" do
@@ -121,13 +133,13 @@ RSpec.describe Sqeduler::LockMaintainer do
     end
 
     context "when outside the run threshold" do
-      let(:run_at) { Time.now - described_class::RUN_INTERVAL - 5 }
+      let(:run_at) { (Time.now - described_class::RUN_INTERVAL - 5).to_i }
 
       let(:lock_key) { SyncExclusiveWorker.sync_lock_key(job_args) }
 
       it "refresh the lock" do
         SyncExclusiveWorker.new.perform(job_args) do
-          Sqeduler::Service.redis_pool do |redis|
+          Sqeduler::Service.redis_pool.with do |redis|
             # Change the lock timing to make sure ours works
             redis.expire(lock_key, 10)
             expect(redis.ttl(lock_key)).to eq(10)
@@ -141,17 +153,10 @@ RSpec.describe Sqeduler::LockMaintainer do
         end
 
         # Shouldn't be around once the job finished
-        Sqeduler::Service.redis_pool do |redis|
+        Sqeduler::Service.redis_pool.with do |redis|
           expect(redis.exists(lock_key)).to eq(false)
         end
       end
-
-      it "obeys the exclusive lock" do
-        instance.send(:redis_lock).send(:take_lock)
-        expect(instance).to_not receive(:str_to_class)
-
-        sync
-      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqeduler
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jared Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq