logstash-mixin-rabbitmq_connection 4.1.2-java → 4.1.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8172473666f47a825c6e32283d170aa1687c676
-  data.tar.gz: 8f31ac4f87bc9a55cf82f64b7d1732ae3167f7d7
+  metadata.gz: 2ea336ab01162c3e3d4c52b822b3f843e857b5b9
+  data.tar.gz: 68df566879f34bcd6eef31590cb4ec5a982f20f4
 SHA512:
-  metadata.gz: 0bdca603406eccc887d68fb7740d925a68f6ad234fecd86b529cf90133646bbead8db802a72be8dba4f7a5f4857d5a96a756b46a1e5764bf982debdf12e647f5
-  data.tar.gz: 82f5bce851cf375cf59ea55eee435584d99f1bc03758600a0777caf52c40ccb262a584c80c8f9801f71125bb4d25901fa042e7833dce96c2a3ac83f6b5bf1131
+  metadata.gz: b5863c4c931266e1a7fa1f770236b82c714a943400e53da7242bb1e1761f6dc2920a14590eba8fbf88123f65c9570fd8ab868b9f4cc597dc4788e894eb7fca51
+  data.tar.gz: 1b9e2e6a31028ea37f6daa169384a6a572ac9dc3a0142e1fd7b3abee3ee36400c522b363ebc06ac1aabc2081810f41982a7ef995bcd99a2572e7d448f51978c1

data/CHANGELOG

@@ -1,3 +1,8 @@
+* 4.1.3
+- Bump march_hare version to 2.19.0 to fix reconnection failures with
+  proxies. See
+  https://github.com/logstash-plugins/logstash-input-rabbitmq/issues/76 for
+  more info
 * 4.1.2
   - Retry the connection attempt if there is an IO Exception.
 * 4.1.1
@@ -24,4 +29,4 @@
 * 2.0.0
   - Make LS2 compatible
 * 1.0.1
-  - Initial Release
+  - Initial Release

data/lib/logstash/plugin_mixins/rabbitmq_connection.rb

@@ -18,8 +18,17 @@ module LogStash
       end
 
       def setup_rabbitmq_connection_config
-        # RabbitMQ server address
-        config :host, :validate => :string, :required => true
+        # RabbitMQ server address(es) 
+        # host can either be a single host, or a list of hosts
+        # i.e.
+        #   host => "localhost"
+        # or
+        #   host => ["host01", "host02]
+        #
+        # if multiple hosts are provided on the initial connection and any subsequent
+        # recovery attempts of the hosts is chosen at random and connected to.
+        # Note that only one host connection is active at a time.
+        config :host, :validate => :string, :required => true , :list => true
 
         # RabbitMQ port to connect on
         config :port, :validate => :number, :default => 5672
@@ -99,7 +108,7 @@ module LogStash
 
         s = {
           :vhost => @vhost,
-          :host  => @host,
+          :hosts => @host,
           :port  => @port,
           :user  => @user,
           :automatic_recovery => @automatic_recovery,
@@ -123,7 +132,6 @@ module LogStash
           s[:tls_certificate_password] = cert_pass
         end
 
-
         @rabbitmq_settings = s
       end
 

data/logstash-mixin-rabbitmq_connection.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-rabbitmq_connection'
-  s.version         = '4.1.2'
+  s.version         = '4.1.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Common functionality for RabbitMQ plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   s.platform = RUBY_PLATFORM
-  s.add_runtime_dependency 'march_hare', ['~> 2.15.0'] #(MIT license)
+  s.add_runtime_dependency 'march_hare', ['~> 2.19.0'] #(MIT license)
   s.add_runtime_dependency 'stud', '~> 0.0.22'
 
   s.add_development_dependency 'logstash-devutils'

data/spec/plugin_mixins/rabbitmq_connection_spec.rb

@@ -58,6 +58,32 @@ describe LogStash::PluginMixins::RabbitMQConnection do
     it "should set tls_certificate_password to the expected value" do
       expect(instance.rabbitmq_settings[:tls_certificate_password]).to eql(rabbitmq_settings["ssl_certificate_password"])
     end
+
+    it "should set hosts to the expected value " do
+      expect(instance.rabbitmq_settings[:hosts][0]).to eql(host)
+    end
+
+    it "should only insert a single host entry" do
+      expect(instance.rabbitmq_settings[:hosts].length).to eql(1)
+    end
+  end
+
+  describe "rabbitmq_settings multiple hosts" do
+    let(:file) { Stud::Temporary.file }
+    let(:path) { file.path }
+    after { File.unlink(path)}
+
+    let(:rabbitmq_settings) { super.merge({"host" => ["host01", "host02", "host03"]}) }
+
+    it "should set hosts to the expected value" do
+      expect(instance.rabbitmq_settings[:hosts][0]).to eql("host01")
+      expect(instance.rabbitmq_settings[:hosts][1]).to eql("host02")
+      expect(instance.rabbitmq_settings[:hosts][2]).to eql("host03")
+    end
+
+    it "should insert 3 host entries" do
+      expect(instance.rabbitmq_settings[:hosts].length).to eql(3)
+    end
   end
 
   context "when connected" do

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.19.0
   name: march_hare
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: