resque-lock-timeout 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc8ebf154ea6508ebd762f6860002c07f70412d
-  data.tar.gz: 7053ff9081baa02832267aeb5739ec9d46317269
+  metadata.gz: 15a27985b2511a44c3f9808f0083d08f8f023d5d
+  data.tar.gz: 7daba033435c96b21d64119c9722019c95873e63
 SHA512:
-  metadata.gz: 590c45f94ec0dc1b40612a94b7545b7c01964eeced9e7ce0d5b0e4f0af4763cdca0223fc991e6c66c03cb462a497a31fb1cb28aa611673153e2cbcd83ed343a0
-  data.tar.gz: c678088940a1857169695fa0907dad6b9cf9839c3f9f571c974128dfcebef92dba36e960a5143452ce515d7542e74eb99004e5590be9f14cc8207e3e23e8e091
+  metadata.gz: 5ad5415a6ee68d5a9a8692d0cad712247fad35cb24604ee9b2b108778b168ac7a78d7ca5e7f0bd7e5d77b9c599a01eb158f9975571d7ed7e916579a49d9ff343
+  data.tar.gz: 41cb07ffda36778df97b21e5a52a37d1d3941aa185fe9fadb0bb5b723004137bf6accfbc030faa8403f2b61b1c7b409ed2797f1ab17afd2c7bcdbe0b43a21dcb

data/HISTORY.md

@@ -1,39 +1,43 @@
+## 0.4.5 (2015-08-04)
+
+- Fix: ensure exceptions are kept if raised **after** lock timeout expires.
+
 ## 0.4.4 (2014-02-21)
 
-* Add `enqueued?` and `loner_locked?` helper methods.
-* Bump minimum version of resque to v1.22
+- Add: `enqueued?` and `loner_locked?` helper methods.
+- Bump minimum version of resque to v1.22
 
 ## 0.4.1 (2012-11-19)
 
-* Bug fix, allow `@loner` job to be enqueued if timeout expires.
+- Fix: allow `@loner` job to be enqueued if timeout expires.
 
 ## 0.4.0 (2012-11-09)
 
-* Add `@loner` boolean option to prevent job being enqueued if already
+- Add: `@loner` boolean option to prevent job being enqueued if already
   running/enqueued. (Thanks to @ssaunier)
 
 ## 0.3.3 (2012-03-09)
 
-* Tested against v1.20.0 of resque.
+- Tested against v1.20.0 of resque.
 
 ## 0.3.1 (2011-07-16)
 
-* Pass job arguments to `lock_timeout`. (Bob Potter)
-* Added `refresh_lock!` method for long running jobs. (Bob Potter)
+- Pass job arguments to `lock_timeout`. (Bob Potter)
+- Added `refresh_lock!` method for long running jobs. (Bob Potter)
 
 ## 0.3.0 (2011-07-16)
 
-* Ability to customize redis connection used for storing locks.
+- Ability to customize redis connection used for storing locks.
   (thanks Richie Vos =))
-* Added Bundler `Gemfile`.
-* Added abstract stub methods for callback methods:
+- Added Bundler `Gemfile`.
+- Added abstract stub methods for callback methods:
   `lock_failed`, `lock_expired_before_release`
 
 ## 0.2.1 (2010-06-16)
 
-* Relax gemspec dependancies.
+- Relax gemspec dependancies.
 
 ## 0.2.0 (2010-05-05)
 
-* Initial release as `resque-lock-timeout`, forked from Chris Wanstrath'
-  `resque-lock`.
+- Initial release as `resque-lock-timeout`, forked from Chris Wanstrath'
+  `resque-lock`.

data/lib/resque/plugins/lock_timeout.rb

@@ -287,15 +287,13 @@ module Resque
         ensure
           # Release the lock on success and error. Unless a lock_timeout is
           # used, then we need to be more careful before releasing the lock.
-          unless lock_until === true
-            now = Time.now.to_i
-            if lock_until < now
-              # Eeek! Lock expired before perform finished. Trigger callback.
-              lock_expired_before_release(*args)
-              return # dont relase lock.
-            end
+          now = Time.now.to_i
+          if lock_until != true and lock_until < now
+            # Eeek! Lock expired before perform finished. Trigger callback.
+            lock_expired_before_release(*args)
+          else
+            release_lock!(*args)
           end
-          release_lock!(*args)
         end
       end
 

data/test/lock_test.rb

@@ -225,4 +225,10 @@ class LockTest < Minitest::Test
     Resque.enqueue(LonelyJob)
     assert_equal 1, Resque.size(:test), "Should have enqueued the job"
   end
+
+  def test_exceptions_in_job_after_timeout_should_be_marked_as_failure
+    Resque.enqueue(FailingAfterTimeoutJob)
+    @worker.process
+    assert_equal 1, Resque::Failure.count, "Should have been marked as failure"
+  end
 end

data/test/test_jobs.rb

@@ -158,3 +158,15 @@ class LonelyTimeoutExpiringJob
     sleep 2
   end
 end
+
+# Job that raises an error after its timeout.
+class FailingAfterTimeoutJob
+  extend Resque::Plugins::LockTimeout
+  @queue = :test
+  @lock_timeout = 1
+
+  def self.perform
+    sleep 2
+    raise
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-lock-timeout
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Luke Antins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -30,16 +30,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Resque plugin adding locking, with optional timeout/deadlock handling to