stalking 0.0.9 → 0.1.0

data/README.md

@@ -154,7 +154,7 @@ when a single server is down, of course require some time for the error
 detection and processing. This usually should not be a big issue, except there
 is some temporary lag between the producer and the beanstalkd server. The
 producer then has to wait for a timeout and while the producer is waiting for
-the timeout it will block your application. The default timeout is 250
+the timeout it will block your application. The default timeout is 500
 milliseconds, but you can change the timeout via:
 
 ```ruby

data/lib/stalking/producer.rb

@@ -2,17 +2,13 @@
 module Stalking
   class Producer
     def initialize(options = {}, &block)
-      @timeout = options[:timeout] || 0.25
-
+      @timeout = options[:timeout] || 0.5
       @pri = options[:pri] || 65536
       @delay = options[:delay] || 0
       @ttr = options[:ttr] || 120
-
       @logger = options[:logger]
-
       @servers = options[:servers] || ["localhost:11300"]
-
-      @tries = options[:tries] || @servers.size
+      @tries = options[:tries] || [@servers.size, 2].max
 
       @connections = {}
     end
@@ -22,33 +18,8 @@ module Stalking
 
       # Send the job to a random server.
 
-      @servers.shuffle.first(@tries).each do |server|
-        begin
-          Timeout::timeout @timeout do
-            @connections[server] ||= Beanstalk::Pool.new([server])
-
-            enq @connections[server], name, args, options
-          end
-
-          return true
-        rescue Beanstalk::NotConnected
-          # Connecting to the beanstalk server has failed.
-          # Let's try to reconnect and enqueue afterwards.
-
-          begin
-            Timeout::timeout @timeout do
-              @connections[server] = Beanstalk::Pool.new([server])
-
-              enq @connections[server], name, args, options
-            end
-
-            return true
-          rescue Beanstalk::NotConnected, Timeout::Error, StandardError => e
-            @logger.andand.error e
-          end
-        rescue Timeout::Error, StandardError => e
-          @logger.andand.error e
-        end
+      (@servers.shuffle * @tries).first(@tries).each do |server|
+        return true if enqueue_at(server, name, args, options)
       end
 
       @logger.andand.error "Enqueue #{name.inspect} with #{args.inspect} and #{options.inspect} failed"
@@ -61,6 +32,22 @@ module Stalking
 
     private
 
+    def enqueue_at(server, name, args = {}, options = {})
+      Timeout::timeout @timeout do
+        @connections[server] ||= Beanstalk::Pool.new([server])
+
+        enq @connections[server], name, args, options
+      end
+
+      true
+    rescue Beanstalk::NotConnected, Timeout::Error, StandardError => e
+      @connections[server] = nil # Reset the connection.
+
+      @logger.andand.error e
+
+      false
+    end
+
     def enq(connection, name, args = {}, options = {})
       pri = options[:pri] || @pri
       delay = options[:delay] || @delay

data/lib/stalking/version.rb

@@ -1,3 +1,3 @@
 module Stalking
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/test/stalking/producer_test.rb

@@ -32,21 +32,11 @@ class Stalking::ProducerTest < Test::Unit::TestCase
     srand 0
 
     producer.enqueue "test", "up" => "true"
-
     assert_equal ['["test",{"up":"true"}]', 65536, 0, 120], server1.queues["test"].last
 
-    srand 0
-
-    server1.disconnect!
-
-    producer.enqueue "test", "down" => "disconnected"
-
-    assert_equal ['["test",{"down":"disconnected"}]', 65536, 0, 120], server1.queues["test"].last
-
     server1.down!
 
     producer.enqueue "test", "down" => "permanent"
-
     assert_equal ['["test",{"down":"permanent"}]', 65536, 0, 120], server2.queues["test"].last
   end
 
@@ -59,7 +49,6 @@ class Stalking::ProducerTest < Test::Unit::TestCase
     srand 0
 
     producer.enqueue "test", "up" => "true"
-
     assert_equal ['["test",{"up":"true"}]', 65536, 0, 120], server1.queues["test"].last
 
     srand 0
@@ -67,20 +56,19 @@ class Stalking::ProducerTest < Test::Unit::TestCase
     server1.delay = 5
 
     producer.enqueue "test", "down" => "delayed"
-
     assert_equal ['["test",{"down":"delayed"}]', 65536, 0, 120], server2.queues["test"].last
   end
 
   def test_logger
     logger = TestLogger.new
 
-    producer = Stalking::Producer.new(:logger => logger)
+    producer = Stalking::Producer.new(:logger => logger, :tries => 2)
 
     Beanstalk::Pool.new(["localhost:11300"]).down!
 
     producer.enqueue "test", "up" => "true"
 
-    assert_equal ['Enqueue "test" with {"up"=>"true"} and {}', "Beanstalk::NotConnected", 'Enqueue "test" with {"up"=>"true"} and {} failed'], logger.entries.collect(&:to_s)
+    assert_equal ['Enqueue "test" with {"up"=>"true"} and {}', "Beanstalk::NotConnected", "Beanstalk::NotConnected", 'Enqueue "test" with {"up"=>"true"} and {} failed'], logger.entries.collect(&:to_s)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stalking
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake