beetle 0.2.9.4 → 0.2.9.5

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.9.4"
+  s.version = "0.2.9.5"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]

data/examples/rpc.rb

@@ -9,13 +9,13 @@ Beetle.config.servers = "localhost:5672, localhost:5673"
 
 client = Beetle::Client.new
 
-# register a durable queue named 'test'
-# this implicitly registers a durable topic exchange called 'test'
+# register a durable queue named 'echo'
+# this implicitly registers a durable topic exchange called 'echo'
 client.register_queue(:echo)
 client.register_message(:echo)
 
 if ARGV.include?("--server")
-  # register a handler for the test message, listing on queue "test"
+  # register a handler for the echo message, listing on queue "echo"
   # echoing all data sent to it
   client.register_handler(:echo) do |m|
     # send data back to publisher

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -111,9 +111,10 @@ end
 Then /^the redis master of the beetle handler should be "([^\"]*)"$/ do |redis_name|
   Beetle.config.servers = "localhost:5672" # rabbitmq
   Beetle.config.logger.level = Logger::INFO
-  client = Beetle::Client.new
-  client.register_queue(:echo)
-  client.register_message(:echo)
+  client = Beetle::Client.new.configure :auto_delete => true do |config|
+    config.queue(:echo)
+    config.message(:echo)
+  end
   assert_equal TestDaemons::Redis[redis_name].ip_with_port, client.rpc(:echo, 'nil').second
 end
 

data/lib/beetle/publisher.rb

@@ -33,12 +33,12 @@ module Beetle
     end
 
     def publish_with_failover(exchange_name, message_name, data, opts) #:nodoc:
-      tries = @servers.size
+      tries = @servers.size * 2
       logger.debug "Beetle: sending #{message_name}"
       published = 0
       opts = Message.publishing_options(opts)
       begin
-        select_next_server
+        select_next_server if tries.even?
         bind_queues_for_exchange(exchange_name)
         logger.debug "Beetle: trying to send message #{message_name}:#{opts[:message_id]} to #{@server}"
         exchange(exchange_name).publish(data, opts)
@@ -46,8 +46,11 @@ module Beetle
         published = 1
       rescue *bunny_exceptions
         stop!
-        mark_server_dead
         tries -= 1
+        # retry same server on receiving the first exception for it (might have been a normal restart)
+        # in this case you'll see either a broken pipe or a forced connection shutdown error
+        retry if tries.odd?
+        mark_server_dead
         retry if tries > 0
         logger.error "Beetle: message could not be delivered: #{message_name}"
         raise NoMessageSent.new
@@ -64,8 +67,9 @@ module Beetle
       opts = Message.publishing_options(opts)
       loop do
         break if published.size == 2 || @servers.empty? || published == @servers
+        tries = 0
+        select_next_server
         begin
-          select_next_server
           next if published.include? @server
           bind_queues_for_exchange(exchange_name)
           logger.debug "Beetle: trying to send #{message_name}:#{opts[:message_id]} to #{@server}"
@@ -74,6 +78,7 @@ module Beetle
           logger.debug "Beetle: message sent (#{published})!"
         rescue *bunny_exceptions
           stop!
+          retry if (tries += 1) == 1
           mark_server_dead
         end
       end

data/lib/beetle/subscriber.rb

@@ -122,6 +122,9 @@ module Beetle
           Beetle::reraise_expectation_errors!
           # swallow all exceptions
           logger.error "Beetle: internal error during message processing: #{$!}: #{$!.backtrace.join("\n")}"
+        ensure
+          # support amqp metrics logging if we have it
+          logger.agent.flush if logger.respond_to?(:agent)
         end
       end
     end

data/test/beetle/publisher_test.rb

@@ -79,12 +79,12 @@ module Beetle
       @pub.servers << "localhost:3333"
       raising_exchange = mock("raising exchange")
       nice_exchange = mock("nice exchange")
-      @pub.stubs(:exchange).with("mama-exchange").returns(raising_exchange).then.returns(nice_exchange)
+      @pub.stubs(:exchange).with("mama-exchange").returns(raising_exchange).then.returns(raising_exchange).then.returns(nice_exchange)
 
-      raising_exchange.expects(:publish).raises(Bunny::ConnectionError)
+      raising_exchange.expects(:publish).raises(Bunny::ConnectionError).twice
       nice_exchange.expects(:publish)
       @pub.expects(:set_current_server).twice
-      @pub.expects(:stop!).once
+      @pub.expects(:stop!).twice
       @pub.expects(:mark_server_dead).once
       @pub.publish_with_failover("mama-exchange", "mama", @data, @opts)
     end
@@ -112,6 +112,8 @@ module Beetle
       @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(redundant)
       e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(redundant)
       @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(redundant)
+      e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(redundant)
+      @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(redundant)
       e.expects(:publish).in_sequence(redundant)
 
       assert_equal 1, @pub.publish_with_redundancy("mama-exchange", "mama", @data, @opts)
@@ -127,6 +129,10 @@ module Beetle
       e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(redundant)
       @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(redundant)
       e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(redundant)
+      @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(redundant)
+      e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(redundant)
+      @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(redundant)
+      e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(redundant)
 
       assert_raises Beetle::NoMessageSent do
         @pub.publish_with_redundancy("mama-exchange", "mama", @data, @opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 115
+  hash: 113
   prerelease: false
   segments: 
   - 0
   - 2
   - 9
-  - 4
-  version: 0.2.9.4
+  - 5
+  version: 0.2.9.5
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +01:00
+date: 2010-11-30 00:00:00 +01:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency