beanstalk-client 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.1 2008-01-22
+
+* More useful behavior when we lose the connection or the server is in drain
+  mode.
+
 == 0.6.0 2008-01-04
 
 * Protocol updates. Works with beanstalkd 0.6.

data/Manifest.txt

@@ -8,6 +8,7 @@ config/requirements.rb
 lib/beanstalk-client.rb
 lib/beanstalk-client/bag.rb
 lib/beanstalk-client/connection.rb
+lib/beanstalk-client/errors.rb
 lib/beanstalk-client/job.rb
 lib/beanstalk-client/version.rb
 log/debug.log

data/lib/beanstalk-client.rb

@@ -21,9 +21,6 @@ module Beanstalk
   extend self
 
   attr_accessor :select
-
-  class UnexpectedResponse < RuntimeError
-  end
 end
 
 require 'beanstalk-client/connection'

data/lib/beanstalk-client/connection.rb

@@ -19,6 +19,7 @@ require 'socket'
 require 'fcntl'
 require 'yaml'
 require 'beanstalk-client/bag'
+require 'beanstalk-client/errors'
 require 'beanstalk-client/job'
 
 module Beanstalk
@@ -183,7 +184,7 @@ module Beanstalk
     def method_missing(selector, *args, &block)
       begin
         @conn.send(selector, *args, &block)
-      rescue EOFError, Errno::ECONNRESET => ex
+      rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, UnexpectedResponse => ex
         @multi.remove(@conn)
         raise ex
       end
@@ -216,25 +217,26 @@ module Beanstalk
       @connections.values()
     end
 
-    def put(body, pri=65536, delay=0, ttr=120)
-      pick_connection.put(body, pri, delay, ttr)
-    rescue EOFError, Errno::ECONNRESET
+    def send_to_conn(sel, *args)
+      pick_connection.send(sel, *args)
+    rescue DrainingError
+      # Don't reconnect -- we're not interested in this server
+      retry
+    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE
       connect()
       retry
     end
 
+    def put(body, pri=65536, delay=0, ttr=120)
+      send_to_conn(:put, body, pri, delay, ttr)
+    end
+
     def yput(obj, pri=65536, delay=0, ttr=120)
-      pick_connection.yput(obj, pri, delay, ttr)
-    rescue EOFError, Errno::ECONNRESET
-      connect()
-      retry
+      send_to_conn(:yput, obj, pri, delay, ttr)
     end
 
     def reserve()
-      pick_connection.reserve()
-    rescue EOFError, Errno::ECONNRESET
-      connect()
-      retry
+      send_to_conn(:reserve)
     end
 
     def raw_stats()
@@ -260,7 +262,7 @@ module Beanstalk
     private
 
     def pick_connection()
-      open_connections[rand(open_connections.size)] or raise 'not connected'
+      open_connections[rand(open_connections.size)] or raise NotConnected
     end
   end
 end

data/lib/beanstalk-client/errors.rb

@@ -0,0 +1,33 @@
+# beanstalk-client/errors.rb - client library for beanstalk
+
+# Copyright (C) 2007 Philotic Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Beanstalk
+  class NotConnected < RuntimeError
+  end
+
+  class UnexpectedResponse < RuntimeError
+    def self.new(word)
+      if self == UnexpectedResponse and word == 'DRAINING'
+        return DrainingError.new(nil)
+      end
+      super(word)
+    end
+  end
+
+  class DrainingError < UnexpectedResponse
+  end
+end

data/lib/beanstalk-client/version.rb

@@ -1,5 +1,5 @@
 module Beanstalk #:nodoc:
   module VERSION #:nodoc:
-    STRING = '0.6.0'
+    STRING = '0.6.1'
   end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Beanstalk Client</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/beanstalk"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/beanstalk" class="numbers">0.6.0</a>
+      <a href="http://rubyforge.org/projects/beanstalk" class="numbers">0.6.1</a>
     </div>
     <h1>&#x2192; &#8216;beanstalk-client&#8217;</h1>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: beanstalk-client
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2008-01-04 00:00:00 -08:00
+  version: 0.6.1
+date: 2008-01-22 00:00:00 -08:00
 summary: Ruby client library for the Beanstalk protocol
 require_paths: 
 - lib
@@ -39,6 +39,7 @@ files:
 - lib/beanstalk-client.rb
 - lib/beanstalk-client/bag.rb
 - lib/beanstalk-client/connection.rb
+- lib/beanstalk-client/errors.rb
 - lib/beanstalk-client/job.rb
 - lib/beanstalk-client/version.rb
 - log/debug.log