logstash-mixin-rabbitmq_connection 2.0.2-java → 2.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708cbc1a1b93eb361ca3171cf52bb4b8ffc96b60
-  data.tar.gz: fd69d3314486d68c844a99c5fc09f24211001674
+  metadata.gz: 8dcab8d78a4949e57c440fcef4d467a988850c38
+  data.tar.gz: d8ae8f4162be1ab1b209bc7691c5e80c80b10e8e
 SHA512:
-  metadata.gz: bd02b93acea04a314039bc458ce3d8f0e04f676ecc3fb03fc06124590adca48d8733679cb53966a8496c9866c78bd8d57bf1fe8c7f766afc7756ac3bc26a8141
-  data.tar.gz: eb945382e7bdf2b822c5ff319ad6601eca31511a97a72c04bf1a7594ffc43098078eebd56611a4d3f004677babe390af75efe364ce45a9d96d8de4b06fb50a78
+  metadata.gz: eecfa540f15d9035b3ee1d06af65385b2fba199236fe282619bada989e4fce502365d41f1b0008597426c3b6256fbcf7ddc39614caba8447b716ae9bcbeb3cf2
+  data.tar.gz: 9080f84ca00d661e2e8e9e1af104fe0ab8cbc781cbccf9ff29663fd2e2428c985b61e1ae504e7e5b89bf1ea2ab6b929420adb0c932ec00a14ee0990c871072d6

data/CHANGELOG

@@ -0,0 +1,11 @@
+* 2.1.1 
+  - Make rake vendor run, for jarvis
+* 2.1.0
+  - Add prefetch_count config option
+* 2.0.3
+  - Add heartbeat setting
+  - Add connect_timeout setting
+* 2.0.0
+  - Make LS2 compatible
+* 1.0.1
+  - Initial Release

data/Rakefile

@@ -0,0 +1 @@
+require "logstash/devutils/rake"

data/lib/logstash/plugin_mixins/rabbitmq_connection.rb

@@ -48,9 +48,18 @@ module LogStash
         # Time in seconds to wait before retrying a connection
         config :connect_retry_interval, :validate => :number, :default => 1
 
+        # The default connection timeout in milliseconds. If not specified the timeout is infinite.
+        config :connection_timeout, :validate => :number
+
+        # Heartbeat delay in seconds. If unspecified no heartbeats will be sent
+        config :heartbeat, :validate => :number
+
         # Passive queue creation? Useful for checking queue existance without modifying server state
         config :passive, :validate => :boolean, :default => false
 
+        # Prefetch count. Number of messages to prefetch
+        config :prefetch_count, :validate => :number, :default => 256
+
         # Extra queue arguments as an array.
         # To make a RabbitMQ queue mirrored, use: `{"x-ha-policy" => "all"}`
         config :arguments, :validate => :array, :default => {}
@@ -77,6 +86,9 @@ module LogStash
           :automatic_recovery => @automatic_recovery,
           :pass => @password ? @password.value : "guest",
         }
+
+        s[:timeout] = @connection_timeout || 0
+        s[:heartbeat] = @heartbeat || 0
         s[:tls] = @ssl if @ssl
         @rabbitmq_settings = s
       end
@@ -130,6 +142,8 @@ module LogStash
         connection.on_unblocked { @logger.warn("RabbitMQ output unblocked!") }
 
         channel = connection.create_channel
+        channel.prefetch = prefetch_count
+
         @logger.info("Connected to RabbitMQ at #{rabbitmq_settings[:host]}")
 
         HareInfo.new(connection, channel)
@@ -140,4 +154,4 @@ module LogStash
       end
     end
   end
-end
+end

data/logstash-mixin-rabbitmq_connection.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
-
   s.name            = 'logstash-mixin-rabbitmq_connection'
-  s.version         = '2.0.2'
+  s.version         = '2.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Common functionality for RabbitMQ plugins"
   s.description     = "This is used to provide configuration options and connection settings for logstash plugins working with RabbitMQ"

data/spec/plugin_mixins/rabbitmq_connection_spec.rb

@@ -26,6 +26,18 @@ describe LogStash::PluginMixins::RabbitMQConnection do
   }
   let(:hare_info) { instance.instance_variable_get(:@hare_info) }
 
+  describe "rabbitmq_settings" do
+    let(:rabbitmq_settings) { super.merge({"connection_timeout" => 123, "heartbeat" => 456}) }
+
+    it "should set the timeout to the expected value" do
+      expect(instance.rabbitmq_settings[:timeout]).to eql(rabbitmq_settings["connection_timeout"])
+    end
+
+    it "should set heartbeat to the expected value" do
+      expect(instance.rabbitmq_settings[:heartbeat]).to eql(rabbitmq_settings["heartbeat"])
+    end
+  end
+
   context "when connected" do
     let(:connection) { double("MarchHare Connection") }
     let(:channel) { double("Channel") }
@@ -36,6 +48,7 @@ describe LogStash::PluginMixins::RabbitMQConnection do
       allow(connection).to receive(:create_channel).and_return(channel)
       allow(connection).to receive(:on_blocked)
       allow(connection).to receive(:on_unblocked)
+      allow(channel).to receive(:prefetch=).with(kind_of(Numeric))
 
       instance.register
     end
@@ -66,6 +79,10 @@ describe LogStash::PluginMixins::RabbitMQConnection do
       it "should set the channel correctly" do
         expect(subject.channel).to eql(channel)
       end
+
+      it "should set prefetch correctly" do
+        expect(subject.channel.prefetch=50).to eql(50)
+      end
     end
   end
 
@@ -100,4 +117,4 @@ describe LogStash::PluginMixins::RabbitMQConnection do
       expect(subject).to have_received(:sleep_for_retry).once
     end
   end
-end
+end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,76 +28,78 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: march_hare
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  name: march_hare
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
-- !ruby/object:Gem::Dependency
+        version: 0.0.22
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.22
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-input-generator
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-input-generator
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This is used to provide configuration options and connection settings for logstash plugins working with RabbitMQ
 email: info@elastic.co
 executables: []
@@ -107,8 +107,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - Gemfile
 - README.md
+- Rakefile
 - lib/logstash/plugin_mixins/rabbitmq_connection.rb
 - logstash-mixin-rabbitmq_connection.gemspec
 - spec/plugin_mixins/rabbitmq_connection_spec.rb
@@ -132,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Common functionality for RabbitMQ plugins