beetle 0.2.0 → 0.2.1

data/beetle.gemspec

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

data/lib/beetle/publisher.rb

@@ -132,11 +132,16 @@ module Beetle
       b
     end
 
+    # retry dead servers after ignoring them for 10.seconds
+    # if all servers are dead, retry the one which has been dead for the longest time
     def recycle_dead_servers
       recycle = []
       @dead_servers.each do |s, dead_since|
         recycle << s if dead_since < 10.seconds.ago
       end
+      if recycle.empty? && @servers.empty?
+        recycle << @dead_servers.keys.sort_by{|k| @dead_servers[k]}.first
+      end
       @servers.concat recycle
       recycle.each {|s| @dead_servers.delete(s)}
     end
@@ -149,8 +154,11 @@ module Beetle
     end
 
     def select_next_server
-      return logger.error("Beetle: message could not be delivered - no server available") && 0 if @servers.empty?
-      set_current_server(@servers[((@servers.index(@server) || 0)+1) % @servers.size])
+      if @servers.empty?
+        logger.error("Beetle: no server available")
+      else
+        set_current_server(@servers[((@servers.index(@server) || 0)+1) % @servers.size])
+      end
     end
 
     def create_exchange!(name, opts)

data/test/beetle/publisher_test.rb

@@ -284,7 +284,7 @@ module Beetle
       assert_kind_of Time, dead["localhost:2222"]
     end
 
-    test "recycle_dead_servers should move servers from the dead server hash to the servers list only if the have been markd dead for longer than 10 seconds" do
+    test "recycle_dead_servers should move servers from the dead server hash to the servers list only if they have been markd dead for longer than 10 seconds" do
       @pub.servers = ["a:1", "b:2"]
       @pub.send(:set_current_server, "a:1")
       @pub.send(:mark_server_dead)
@@ -299,6 +299,19 @@ module Beetle
       assert_equal({}, dead)
     end
 
+    test "recycle_dead_servers should recycle the server which has been dead for the longest time if all servers are dead " do
+      @pub.servers = ["a:1", "b:2"]
+      @pub.send(:set_current_server, "a:1")
+      @pub.send(:mark_server_dead)
+      @pub.send(:mark_server_dead)
+      assert_equal [], @pub.servers
+      dead = @pub.instance_variable_get("@dead_servers")
+      assert_equal ["a:1", "b:2"], dead.keys.sort
+      @pub.send(:recycle_dead_servers)
+      assert_equal ["b:2"], dead.keys
+      assert_equal ["a:1"], @pub.servers
+    end
+
     test "select_next_server should cycle through the list of all servers" do
       @pub.servers = ["a:1", "b:2"]
       @pub.send(:set_current_server, "a:1")
@@ -308,12 +321,13 @@ module Beetle
       assert_equal "a:1", @pub.server
     end
 
-    test "select_next_server should return 0 if there are no servers to publish to" do
+    test "select_next_server should log an error if there are no servers to publish to" do
       @pub.servers = []
       logger = mock('logger')
       logger.expects(:error).returns(true)
       @pub.expects(:logger).returns(logger)
-      assert_equal 0, @pub.send(:select_next_server)
+      @pub.expects(:set_current_server).never
+      @pub.send(:select_next_server)
     end
 
     test "stop should shut down all bunnies" do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -12,109 +18,163 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuid4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bunny
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: redis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 0
+        - 3
         version: 2.0.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: amqp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 6
+        - 7
         version: 0.6.7
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: daemons
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
         version: 1.0.10
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
-    version: 
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: daemon_controller
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id010
 description: A highly available, reliable messaging infrastructure
 email: developers@xing.com
 executables: 
@@ -155,6 +215,22 @@ files:
 - beetle.gemspec
 - examples/README.rdoc
 - README.rdoc
+- test/beetle/base_test.rb
+- test/beetle/client_test.rb
+- test/beetle/configuration_test.rb
+- test/beetle/deduplication_store_test.rb
+- test/beetle/handler_test.rb
+- test/beetle/message_test.rb
+- test/beetle/publisher_test.rb
+- test/beetle/r_c_test.rb
+- test/beetle/redis_configuration_client_test.rb
+- test/beetle/redis_configuration_server_test.rb
+- test/beetle/redis_ext_test.rb
+- test/beetle/redis_master_file_test.rb
+- test/beetle/subscriber_test.rb
+- test/beetle_test.rb
+- test/test_helper.rb
+- bin/beetle
 has_rdoc: true
 homepage: http://xing.github.com/beetle/
 licenses: []
@@ -165,21 +241,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues