redact 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee51358dbb8a6851e198db0b85821c751eadd91
-  data.tar.gz: a9ff5586c8a2ff9fdb6963667e7d8bff592a088c
+  metadata.gz: 9f859024a006575309d7d616e5a1c996e5c1e79c
+  data.tar.gz: 6ef60e3ad77160e2d22a1d538f71f10be6043962
 SHA512:
-  metadata.gz: d4a3c90d19c30edbb81eadb2b293262f8f4e6b985fc548365b2331945199d19ee14e5b05711ca616557a480bf1b3154f457791d1047c726cf13b2196849eae86
-  data.tar.gz: 63cbccbaf00f39fb0a8327c9dec9a5582fbde539aae6678368e128292bc32e6bb77852f51af7d005b428928c2f83fe60c5e21d2d08bfd03aa771723b0c906bbe
+  metadata.gz: 68805e7ee55892d4898e57ee98fb51307297090b7b4de6d444c98f21c05a3e388cb301b54bd6394e2ef3accf4594f5dc46f38f439836b143dcf6e5245b7b5ba5
+  data.tar.gz: 77ad7358b7ce73b0f90397c4fbf4a69842f2d1bdeeba74fa1346241e005c7ac17b594cfbd74d6832635e4ef6e25bb9732a62eedc48a6dd526a1428da9d0944a6

data/lib/redact.rb

@@ -151,18 +151,22 @@ class Redact
   ##
   ## +opts+ are:
   ## * +blocking+: if true, #each will block until items are available (and will never return)
+  ## * +block_timeout+: when +blocking+ is true, the timeout (in seconds) before stopping. A value of nil or 0 will block forever.
   ## * +retries+: how many times an individual job should be retried before resulting in an error state. Default is 2 (so 3 tries total).
   ## * +worker_id+: the id of this worker process, for debugging. (If nil, will use a reasonably intelligent default.)
   def each opts={}
     worker_id = opts[:worker_id] || [Socket.gethostname, $$, $0].join("-")
     retries = opts[:retries] || 2
     blocking = opts[:blocking]
+    block_timeout = opts[:block_timeout] || 0
 
     while true
-      ## get the token of the next task to perform
-      meth = blocking ? :brpoplpush : :rpoplpush
-      token = @redis.send meth, @queue, @processing_list
-      break unless token # no more tokens and we're in non-blocking mode
+      token = if blocking
+        @redis.brpoplpush @queue, @processing_list, block_timeout
+      else
+        @redis.rpoplpush @queue, @processing_list
+      end
+      break unless token # no more tokens!
 
       ## decompose the token
       task, target, run_id, insertion_time = parse_token token

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redact
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - William Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop