beanstalk-client 0.10.0 → 0.11.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.11.0 2008-04-17
+
+* Fix an infinite loop bug when the server goes away.
+
 == 0.10.0 2008-04-11
 
 * Some optimizations to avoid sending unnecessary use and watch commands.

data/lib/beanstalk-client/connection.rb

@@ -209,6 +209,7 @@ module Beanstalk
 
     def method_missing(selector, *args, &block)
       begin
+        @multi.last_conn = @conn
         @conn.send(selector, *args, &block)
       rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, UnexpectedResponse => ex
         @multi.remove(@conn)
@@ -218,6 +219,8 @@ module Beanstalk
   end
 
   class Pool
+    attr_accessor :last_conn
+
     def initialize(addrs)
       @addrs = addrs
       connect()
@@ -330,40 +333,43 @@ module Beanstalk
 
     private
 
-    def send_to_each_conn_first_res(sel, *args)
-      open_connections.each do |c|
-        x = wrap(c, sel, *args)
-        return x if x
-      end
-      nil
+    def wrap(*args)
+      yield
+    rescue DrainingError
+      # Don't reconnect -- we're not interested in this server
+      retry
+    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE
+      connect()
+      retry
     end
 
-    def send_to_rand_conn(sel, *args)
-      wrap(pick_connection, sel, *args)
+    def send_to_each_conn_first_res(*args)
+      connect()
+      wrap{open_connections.inject(nil) {|r,c| r or c.send(*args)}}
     end
 
-    def send_to_all_conns(sel, *args)
-      compact_hash(make_hash(@connections.map{|a, c| [a, wrap(c, sel, *args)]}))
+    def send_to_rand_conn(*args)
+      connect()
+      wrap{pick_connection.send(*args)}
     end
 
-    def pick_connection()
-      open_connections[rand(open_connections.size)] or raise NotConnected
+    def send_to_all_conns(*args)
+      connect()
+      wrap{compact_hash(map_hash(@connections){|c| c.send(*args)})}
     end
 
-    def wrap(conn, sel, *args)
-      (@last_conn = conn).send(sel, *args)
-    rescue DrainingError
-      # Don't reconnect -- we're not interested in this server
-      retry
-    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE
-      connect()
-      retry
+    def pick_connection()
+      open_connections[rand(open_connections.size)] or raise NotConnected
     end
 
     def make_hash(pairs)
       Hash[*pairs.inject([]){|a,b|a+b}]
     end
 
+    def map_hash(h)
+      make_hash(h.map{|k,v| [k, yield(v)]})
+    end
+
     def compact_hash(hash)
       hash.reject{|k,v| v == nil}
     end

data/lib/beanstalk-client/version.rb

@@ -1,5 +1,5 @@
 module Beanstalk #:nodoc:
   module VERSION #:nodoc:
-    STRING = '0.10.0'
+    STRING = '0.11.0'
   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.10.0</a>
+      <a href="http://rubyforge.org/projects/beanstalk" class="numbers">0.11.0</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.10.0
-date: 2008-04-11 00:00:00 -07:00
+  version: 0.11.0
+date: 2008-04-17 00:00:00 -07:00
 summary: Ruby client library for the Beanstalk protocol
 require_paths: 
 - lib