job_queue 0.0.10 → 0.0.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 10
-:major: 0
 :minor: 0
+:patch: 11
+:major: 0

data/lib/job_queue/adapters/beanstalk_adapter.rb

@@ -39,6 +39,10 @@ class JobQueue::BeanstalkAdapter
         end
       rescue Beanstalk::TimedOut
         # Do nothing - retry to reseve (from another host?)
+      rescue Beanstalk::NotConnected
+        JobQueue.logger.fatal "Could not connect any beanstalk hosts. " \
+          "Retrying in 1s."
+        sleep 1
       rescue => e
         if job
           error_report.call(job.body, e)

data/spec/beanstalk_adapter_spec.rb

@@ -211,6 +211,64 @@ describe JobQueue::BeanstalkAdapter do
     end
   end
 
+  describe "when no instances are available it should not kill the CPU by relentlessly trying to connect to beanstalk, rather it should retry and print a warning every second" do
+    it "(case that 0/1 instances available)" do
+      JobQueue.adapter = JobQueue::BeanstalkAdapter.new
+
+      system "killall beanstalkd"
+
+      JobQueue.logger.should_receive(:fatal).twice
+
+      begin
+        Timeout.timeout(1.1) do
+          JobQueue.subscribe do |job|
+            puts job
+          end
+        end
+      rescue Timeout::Error
+        nil
+      end
+    end
+
+    it "(case that 0/2 instances available)" do
+      JobQueue.adapter = JobQueue::BeanstalkAdapter.new({
+        :hosts => ['localhost:10001', 'localhost:10002']
+      })
+
+      system "killall beanstalkd"
+
+      JobQueue.logger.should_receive(:fatal).twice
+
+      begin
+        Timeout.timeout(1.1) do
+          JobQueue.subscribe do |job|
+            puts job
+          end
+        end
+      rescue Timeout::Error
+        nil
+      end
+    end
+
+    it "(case that 1/2 instances available)" do
+      JobQueue.adapter = JobQueue::BeanstalkAdapter.new({
+        :hosts => ['localhost:10001', 'localhost:10009']
+      })
+
+      JobQueue.logger.should_not_receive(:fatal)
+
+      begin
+        Timeout.timeout(1.1) do
+          JobQueue.subscribe do |job|
+            puts job
+          end
+        end
+      rescue Timeout::Error
+        nil
+      end
+    end
+  end
+
   describe "when connecting to one instance" do
     before :each do
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: job_queue
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Martyn Loughran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 +01:00
+date: 2009-09-02 00:00:00 +01:00
 default_executable: 
 dependencies: []