mloughran-job_queue 0.0.6 → 0.0.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 6
+:patch: 7
 :major: 0

data/lib/job_queue/adapters/beanstalk_adapter.rb

@@ -1,4 +1,5 @@
 require 'beanstalk-client'
+require 'timeout'
 
 class JobQueue::BeanstalkAdapter
   def initialize(options = {})
@@ -18,7 +19,7 @@ class JobQueue::BeanstalkAdapter
   end
 
   def subscribe(error_report, cleanup_task, queue, &block)
-    pool = Beanstalk::Pool.new([@hosts].flatten, queue)
+    pool = BeanstalkPoolFix.new([@hosts].flatten, queue)
     loop do
       begin
         job = pool.reserve(1)
@@ -64,11 +65,11 @@ class JobQueue::BeanstalkAdapter
   def beanstalk_pool(queue='default')
     @beanstalk_pools ||= {}
     @beanstalk_pools[queue] ||= begin
-      Beanstalk::Pool.new([@hosts].flatten, queue)
+      BeanstalkPoolFix.new([@hosts].flatten, queue)
     end
   end
 
-  module BeanstalkExtension
+  class BeanstalkPoolFix < Beanstalk::Pool
     def put_and_report_conn(body, pri=65536, delay=0, ttr=120)
       send_to_rand_conn_and_report(:put, body, pri, delay, ttr)
     end
@@ -84,7 +85,16 @@ class JobQueue::BeanstalkAdapter
     def job_stats(id)
       make_hash(send_to_all_conns(:job_stats, id))
     end
+
+    private
+
+    def call_wrap(c, *args)
+      self.last_conn = c
+      c.send(*args)
+    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Beanstalk::UnexpectedResponse => ex
+      # puts "Beanstalk exception: #{ex.class}" # Useful for debugging
+      self.remove(c) unless ex.class == Beanstalk::TimedOut
+      raise ex
+    end
   end
 end
-
-Beanstalk::Pool.send(:include, JobQueue::BeanstalkAdapter::BeanstalkExtension)

data/spec/beanstalk_adapter_spec.rb

@@ -2,9 +2,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe JobQueue::BeanstalkAdapter do
   before :each do
-    system "beanstalkd -p 10001 -d"
-    system "beanstalkd -p 10002 -d"
-    system "beanstalkd -p 11300 -d"
+    # On OSX we the -d flag doesn't work for beanstalk 1.3. This is a
+    # workaround for that issue. We sleep a little to let processes start.
+    system "beanstalkd -p 10001 &"
+    system "beanstalkd -p 10002 &"
+    system "beanstalkd -p 11300 &"
+    sleep 0.1
   end
 
   after :each do
@@ -13,26 +16,36 @@ describe JobQueue::BeanstalkAdapter do
 
   describe '#new' do
     before(:each) do
-      @pool = Beanstalk::Pool.new(['localhost:11300'])
+      @pool = JobQueue::BeanstalkAdapter::BeanstalkPoolFix.new([
+        'localhost:11300'
+      ])
     end
 
     it "should default to localhost:11300" do
-      Beanstalk::Pool.should_receive(:new).with(['localhost:11300'], "default").and_return @pool
+      JobQueue::BeanstalkAdapter::BeanstalkPoolFix.should_receive(:new).with(
+        ['localhost:11300'],
+        "default"
+      ).and_return @pool
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new
       JobQueue.put('test')
     end
 
     it "should accept one beanstalk instance" do
-      Beanstalk::Pool.should_receive(:new).with(['12.34.56.78:12345'], 'default').and_return(@pool)
-      JobQueue.adapter = JobQueue::BeanstalkAdapter.new(:hosts => '12.34.56.78:12345')
+      JobQueue::BeanstalkAdapter::BeanstalkPoolFix.should_receive(:new).with(
+        ['12.34.56.78:12345'],
+        'default'
+      ).and_return(@pool)
+      JobQueue.adapter = JobQueue::BeanstalkAdapter.new(
+        :hosts => '12.34.56.78:12345'
+      )
       JobQueue.put('test')
     end
 
     it "should allow multiple beanstalk instances" do
-      Beanstalk::Pool.should_receive(:new).with([
-        '12.34.56.78:12345',
-        '87.65.43.21:54321'
-      ], 'default').and_return(@pool)
+      JobQueue::BeanstalkAdapter::BeanstalkPoolFix.should_receive(:new).with(
+        ['12.34.56.78:12345', '87.65.43.21:54321'],
+        'default'
+      ).and_return(@pool)
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new({
         :hosts => ['12.34.56.78:12345', '87.65.43.21:54321']
       })
@@ -41,7 +54,7 @@ describe JobQueue::BeanstalkAdapter do
   end
 
   describe "put" do
-    before :all do
+    before :each do
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new
     end
 
@@ -105,7 +118,7 @@ describe JobQueue::BeanstalkAdapter do
   end
 
   describe "subscribe" do
-    before :all do
+    before :each do
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new
     end
 
@@ -155,10 +168,36 @@ describe JobQueue::BeanstalkAdapter do
 
       File.exists?('jobcleanup').should be_false
     end
+
+    # This test is for a patch that fixes a connection leaking issue in
+    # beanstalk-client 1.0.2
+    it "should not open more connections to beanstalk over time" do
+      # Every 1.5 seconds, add a new job to the queue and check how many
+      # connections are currently open according to beanstalkd.
+      connections = []
+      Thread.new do
+        pool = Beanstalk::Pool.new(["localhost:11300"])
+        loop do
+          sleep 1.5
+          JobQueue.put("job")
+          connections << pool.stats["total-connections"]
+        end
+      end
+
+      # Subscribe for 3 loops - gives time for a few timeouts to occur (1s)
+      i = 0
+      JobQueue.subscribe do |job|
+        i += 1
+        throw :stop if i == 3
+      end
+
+      # The number of connections should have been constant
+      connections.uniq.size.should == 1
+    end
   end
 
   describe "job_stats" do
-    before :all do
+    before :each do
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new
     end
 
@@ -172,7 +211,7 @@ describe JobQueue::BeanstalkAdapter do
   end
 
   describe "when connecting to one instance" do
-    before :all do
+    before :each do
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new
     end
 
@@ -244,7 +283,7 @@ describe JobQueue::BeanstalkAdapter do
   end
 
   describe "when connecting to multiple instances" do
-    before :all do
+    before :each do
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new({
         :hosts => ['localhost:10001', 'localhost:10002']
       })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mloughran-job_queue
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Martyn Loughran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -07:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: []