redis_queue 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2611aeb7b25137f26b161137e3169da32c8f3880
-  data.tar.gz: 8815a25e09045bb8ec6583569f6eb777cfe7ab78
+  metadata.gz: ec321ee8d7b2c72ec76a0061f8676bf7a54f215f
+  data.tar.gz: 6ab9ed9ead9ce2470728e0424a6b7ff96413adff
 SHA512:
-  metadata.gz: 53d783bcb3f12facae37336c9c7fad0a963680bf5d41a41b7de9b76fb1757c392af7ac32c6e220a98d08322be0f5fd19f6a6c24b07f6cbe9940f2d9ceeb2150c
-  data.tar.gz: 42f7bbaec3b42537cb18fa5f665a09a8b7184ac9ee88a90540f1758b13cff5b8a4fa382854a535e9b730cd3f3988fb10e8d3098a3daf7ee2f888d60ecb4c3f5b
+  metadata.gz: 1e815a7e4272d0a79cb8ec709fa5bb663923983227e5a35bbe271c515fa96a496bd792c66cfdef8ed73c337c10e583ef24ea4029d453ec4931b2e5a58df8ddbf
+  data.tar.gz: 4cbee5cb67aa31e53f4a1ea90cc1da7f6593e4b0687fa29b48f32ac6132e5da2bc0109397fd4fc0d8e44a9222d2109367c6ea53b0110e27bd4d817b86ca46b50

data/lib/redis_queue.rb

@@ -12,6 +12,16 @@ class RedisQueue
 
   SCRIPTS   = {
     push: PUSH_CODE,
+    nonblpop: ''"
+      local message = ''
+      while message == '' do
+        message = redis.call('lpop', ARGV[1])
+      end
+      if message then
+        redis.call('sadd', ARGV[1]..'_in_use', message)
+      end
+      return message
+    "'',
     repush: ''"
       #{PUSH_CODE}
       redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
@@ -44,10 +54,9 @@ class RedisQueue
   end
 
   def pop(block: true)
-    command = block ? :blpop : :lpop
+    return nonblpop unless block
     begin
-      message = @redis_blocking.run { |redis| redis.send(command, @id) }
-      message = message.last if command == :blpop
+      message = @redis_blocking.run { |redis| redis.blpop(@id) }.last
     end while message == ''
     @redis.run { |redis| redis.sadd "#{@id}_in_use", message } if message
     message
@@ -148,6 +157,10 @@ class RedisQueue
 
   private
 
+  def nonblpop
+    script :nonblpop, @id
+  end
+
   def load_scripts
     @scripts = {}
     @redis.run do |redis|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_queue
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jose Ignacio Fernandez