summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2015-02-17 21:04:52 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2015-02-17 21:04:52 +0000
commitd6b84b3b79b4afbec3d6b1394cc95edc0b348436 (patch)
tree7f886e20c1b971fa18e4fa36496ccd93483904b6 /lib
parentf2f1db78fd26a54fd5acd1a965c61b8ec2040623 (diff)
fix the redis queue not to melt the cpu when polling redis for a job
Diffstat (limited to 'lib')
-rw-r--r--lib/custodian/queue.rb21
1 files changed, 18 insertions, 3 deletions
diff --git a/lib/custodian/queue.rb b/lib/custodian/queue.rb
index 67c5346..9a7d90f 100644
--- a/lib/custodian/queue.rb
+++ b/lib/custodian/queue.rb
@@ -85,13 +85,28 @@ end
#
- # Fetch a job from the queue - the timeout parameter is ignored.
+ # Fetch a job from the queue.
+ #
+ # The timeout is used to specify the period we wait for a new job.
#
def fetch(timeout)
- job = false
- while( ! job )
+ job = nil
+ timeout ||= 0
+
+ #
+ # Don't melt the CPU.
+ #
+ sleep_interval = 0.5
+
+ loop do
job = @redis.lpop( "queue" )
+ break if job or timeout < 0
+
+ sleep( sleep_interval )
+
+ timeout -= sleep_interval
end
+
return( job )
end