Merge pull request #202 from ripienaar/201

(#201) Allow middleware servers to be randomized

CHANGELOG.md

@@ -1,5 +1,6 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
+|2017/03/06|201   |Allow server randomization to be configured                                                              |
 |2017/02/16|199   |Use the configured *ssl_dir* for storing the public cert cache                                           |
 |2017/02/19|186   |Add a Graphite event task                                                                                |
 |2017/02/17|      |Release 0.0.23                                                                                           |

lib/mcollective/connector/nats.rb

@@ -49,11 +49,11 @@ def connect
         parameters = {
           :max_reconnect_attempts => -1,
           :reconnect_time_wait => 1,
-          :dont_randomize_servers => true,
+          :dont_randomize_servers => !choria.randomize_middleware_servers?,
+          :name => @config.identity,
           :tls => {
             :context => ssl_context
-          },
-          :name => @config.identity
+          }
         }
 
         servers = server_list

lib/mcollective/util/choria.rb

@@ -316,6 +316,13 @@ def middleware_servers(default_host, default_port)
         [[default_host, default_port]]
       end
 
+      # Determines if servers should be randomized
+      #
+      # @return [Boolean]
+      def randomize_middleware_servers?
+        Util.str_to_bool(get_option("choria.randomize_middleware_hosts", "false"))
+      end
+
       # Attempts to look up some SRV records falling back to defaults
       #
       # When given a array of multiple names it will try each name individually

spec/unit/mcollective/connector/nats_spec.rb

@@ -82,11 +82,12 @@ module MCollective
       it "should connect" do
         mock_context = OpenSSL::SSL::SSLContext.new
         connector.stubs(:ssl_context).returns(mock_context)
+        choria.expects(:randomize_middleware_servers?).returns(true)
 
         connector.connection.expects(:start).with(
           :max_reconnect_attempts => -1,
           :reconnect_time_wait => 1,
-          :dont_randomize_servers => true,
+          :dont_randomize_servers => false,
           :name => "rspec_identity",
           :tls => {
             :context => mock_context

spec/unit/mcollective/util/choria_spec.rb

@@ -7,6 +7,18 @@ module Util
       let(:choria) { Choria.new("production", nil, false) }
       let(:parsed_app) { JSON.parse(File.read("spec/fixtures/sample_app.json")) }
 
+      describe "#randomize_middleware_servers?" do
+        it "should default to false" do
+          Config.instance.stubs(:pluginconf).returns({})
+          expect(choria.randomize_middleware_servers?).to be(false)
+        end
+
+        it "should be configurable" do
+          Config.instance.stubs(:pluginconf).returns("choria.randomize_middleware_hosts" => "true")
+          expect(choria.randomize_middleware_servers?).to be(true)
+        end
+      end
+
       describe "#should_use_srv?" do
         it "should default to on" do
           Config.instance.stubs(:pluginconf).returns({})