beetle 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 209c24bac488aa32e51ae851fdc3503a037da362
-  data.tar.gz: 8dd86747e863f217d944add81678ac913a47fa93
+  metadata.gz: a50fa533c34e2207f31db5221a603d77c44d9c15
+  data.tar.gz: aee7aaaa983332ad75b6ff4f685c946a65943157
 SHA512:
-  metadata.gz: baaf7cdca65197eaa33329120b8ccf8ddea1f38987d066336dc2e535b3620b64d8b606dbcfdc0c15edae5593bbdb445550f07fa3433c37a0b7b7f4258189c001
-  data.tar.gz: bec95f2f81b9760e00130b3796e2c6569a9f997408e1249b27ddda650151cc85bf6e1a4bd95c87a4eda0ce2fa14cf4100be564e8a9973cdf90aadbce1f89100e
+  metadata.gz: af16207ccd97dc0318e915a7efeff737af67b5a39a868a8f33dd1a1a2038f84f79f36ef6aba1c18a4c75badd9851e787a0b5c766f9f0a86d98f770dd184bb7b6
+  data.tar.gz: 326faf02f95fe79bdbbb0e264326f05ca1620717b9297814d7626d951bf36c9326655afb161f47344f112302653e321d28266f0729c29345fd1ecc60f7de92d6

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,10 @@
 = Release Notes
 
+== Version 0.4.12
+
+* Don't log warnings when publishing redundantly and only
+  one server is has been configured
+
 == Version 0.4.11
 
 * Automatically close open publisher sockets at program exit

data/lib/beetle/publisher.rb

@@ -2,6 +2,8 @@ module Beetle
   # Provides the publishing logic implementation.
   class Publisher < Base
 
+    attr_reader :dead_servers
+
     def initialize(client, options = {}) #:nodoc:
       super
       @exchanges_with_bound_queues = {}
@@ -63,7 +65,7 @@ module Beetle
 
     def publish_with_redundancy(exchange_name, message_name, data, opts) #:nodoc:
       if @servers.size < 2
-        logger.warn "Beetle: at least two active servers are required for redundant publishing"
+        logger.warn "Beetle: at least two active servers are required for redundant publishing" if @dead_servers.size > 0
         return publish_with_failover(exchange_name, message_name, data, opts)
       end
       published = []

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

data/test/beetle/publisher_test.rb

@@ -170,6 +170,37 @@ module Beetle
       assert_equal 2, @pub.publish_with_redundancy("mama-exchange", "mama", @data, @opts)
     end
 
+    test "redundant publishing should log a warning if only one server is active" do
+      @pub.servers = %w(server1 server2)
+      @pub.server = "server1"
+      @pub.send :mark_server_dead
+
+      redundant = sequence("redundant")
+      e = mock("exchange")
+
+      @pub.logger.expects(:warn).with("Beetle: at least two active servers are required for redundant publishing")
+
+      @pub.expects(:exchange).returns(e).in_sequence(redundant)
+      e.expects(:publish).in_sequence(redundant)
+
+      assert_equal 1, @pub.publish_with_redundancy("mama-exchange", "mama", @data, @opts)
+    end
+
+    test "redundant publishing should not log a warning if only one server exists" do
+      @pub.servers = %w(server1)
+      @pub.server = "server1"
+
+      redundant = sequence("redundant")
+      e = mock("exchange")
+
+      @pub.logger.expects(:warn).with("Beetle: at least two active servers are required for redundant publishing").never
+
+      @pub.expects(:exchange).returns(e).in_sequence(redundant)
+      e.expects(:publish).in_sequence(redundant)
+
+      assert_equal 1, @pub.publish_with_redundancy("mama-exchange", "mama", @data, @opts)
+    end
+
     test "publishing should use the message ttl passed in the options hash to encode the message body" do
       opts = {:ttl => 1.day}
       Message.expects(:publishing_options).with(:ttl => 1.day).returns({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
@@ -248,7 +248,7 @@ files:
 - lib/beetle/subscriber.rb
 - lib/beetle/version.rb
 - script/console
-- script/docker-run-beetle-tests
+- script/docker-run-beetle-tests-
 - script/start_rabbit
 - test/beetle/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb