logstash-input-rabbitmq 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23bf561fdadde23689518cee2bec4774f80dbbc
-  data.tar.gz: 8d4de91afa94ee7c8ed801cbed5bfb752ab7b0d5
+  metadata.gz: a9811d797eb070d68e2463e7eba3e013592b5b7a
+  data.tar.gz: 5b5596bd163c460fe4616783e0517e4715e75683
 SHA512:
-  metadata.gz: 4abe5ece04367dc9f8aadded9f32ec7d495fd3131945cb4e9aa54a862227af22762f07dea20510561cb3345bd2c2ba74520281979363a832e3e21ac32827add9
-  data.tar.gz: afb4839da1b5f33ce161d5ddb738dcc681b72557fd033a57524f26e7470c6200def8b2e3610f82b0ecbfd9d2a84e939c7df0a0b99723f94d551bf97b75be420b
+  metadata.gz: 2d48171b808b11167286a324cb77acfb15738cc12ec2d28acb1b40ad1ea13c7c91feef3af53e54b56a5ebd12e7ac7f1a93e6033d84c29097b398f941f3e8d4cd
+  data.tar.gz: c4a782a78990e84e692637c3c8c7f907f829f119c4ce5afdb5aa7732b4d85245873612d9b1aee0ec9e34530d033bc13facd92650ab965f4b09ad9719a4c4316b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.1.1
+ - Default codec setting should have been JSON
+
+## 3.1.0
+ - Fix broken prefetch count parameter
+
 ## 3.0.2
  - Bump dependency on logstash-mixin-rabbitmq_connection
 

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-rabbitmq-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-rabbitmq-unit/)
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.

data/lib/logstash/inputs/rabbitmq.rb

@@ -7,7 +7,10 @@ module LogStash
     class RabbitMQ < LogStash::Inputs::Threadable
       include ::LogStash::PluginMixins::RabbitMQConnection
 
-      config_name("rabbitmq")
+      config_name "rabbitmq"
+
+      # The default codec for this plugin is JSON. You can override this to suit your particular needs however.
+      default :codec, "json"
 
       # The name of the queue Logstash will consume events from.
       config :queue, :validate => :string, :default => ""
@@ -52,9 +55,9 @@ module LogStash
 
       def register
         connect!
-
         declare_queue!
         bind_exchange!
+        @hare_info.channel.prefetch = @prefetch_count
       end
 
       def run(output_queue)

data/logstash-input-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-rabbitmq'
-  s.version         = '3.0.3'
+  s.version         = '3.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Pull events from a RabbitMQ exchange."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
-  s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 2.0.1', '< 3.0.0'
+  s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 2.2.0', '< 3.0.0'
 
   s.add_runtime_dependency 'logstash-codec-json'
 

data/spec/inputs/rabbitmq_spec.rb

@@ -16,7 +16,8 @@ describe LogStash::Inputs::RabbitMQ do
     {
       "host" => host,
       "port" => port,
-      "queue" => queue
+      "queue" => queue,
+      "prefetch_count" => 123
     }
   }
   let(:instance) { klass.new(rabbitmq_settings) }
@@ -37,6 +38,7 @@ describe LogStash::Inputs::RabbitMQ do
       allow(connection).to receive(:on_unblocked)
       allow(channel).to receive(:exchange).and_return(exchange)
       allow(channel).to receive(:queue).and_return(queue)
+      allow(channel).to receive(:prefetch=)
 
       allow(queue).to receive(:build_consumer).with(:block => true)
       allow(queue).to receive(:subscribe_with).with(any_args)
@@ -44,6 +46,10 @@ describe LogStash::Inputs::RabbitMQ do
       instance.register
     end
 
+    it "should default the codec to JSON" do
+      expect(instance.codec).to be_a(LogStash::Codecs::JSON)
+    end
+
     describe "#connect!" do
       subject { hare_info }
 
@@ -51,6 +57,10 @@ describe LogStash::Inputs::RabbitMQ do
         expect(subject.queue).to eql(queue)
       end
 
+      it "should set the prefetch value correctly" do
+        expect(channel).to have_received(:prefetch=).with(123)
+      end
+
       context "with an exchange declared" do
         let(:instance) { rabbitmq_settings.merge("exchange" => "myexchange", "exchange_type" => "fanout") }
       end
@@ -109,6 +119,10 @@ describe "with a live server", :integration => true do
     end
   end
 
+  it "should have the correct prefetch value" do
+    expect(instance.instance_variable_get(:@hare_info).channel.prefetch).to eql(256)
+  end
+
   describe "receiving a message with a queue specified" do
     let(:queue_name) { "foo_queue" }
     let(:config) { super.merge("queue" => queue_name) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.2.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.2.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -135,3 +135,4 @@ specification_version: 4
 summary: Pull events from a RabbitMQ exchange.
 test_files:
 - spec/inputs/rabbitmq_spec.rb
+has_rdoc: