logstash-output-rabbitmq 0.1.1-java → 0.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d077636bc3938cec6ff586816627df8672759bc
-  data.tar.gz: 0e17b4216d83ef4478357cdc390ae930d2ab8b51
+  metadata.gz: 61ff0be1aa78b095c7ad01148f38c96ca2843104
+  data.tar.gz: a9c14cddefb9ad39dddc3a6df85ff26cc63fe90a
 SHA512:
-  metadata.gz: ad4a194dbab8de29976d76b7c8c509941382b28693ef825a86fbedfbe4fb852094ba5be40ae16590f9472d62eea9fde908080946504a43d125cab2bd7c95ae27
-  data.tar.gz: 9213a4f73ae57cd8e80899a51cc6ab0140f872c8ee0e642c29e3b4004b1d5cc95dc368b850fd8b1b3865c1508ccdf81eeb35f82390ad2c5cda82ddbd577baaa6
+  metadata.gz: 02940932f7ca5c3fe8f628fead0c48bc8152d7f2bd06c588957dccf96e4d5d4e764663c7811b724332fc633266b7edaeba134f108b2e1aacbacf02c99bef70e6
+  data.tar.gz: 8f1544c17b1bfe0e0e80c8a690c93b82d8739892b83199ee0e3194ffd471f053946a4cd765dc896ad74c36a7af792fd3d9e18d2566ad1bc91b16091383086d04

data/lib/logstash/outputs/rabbitmq/march_hare.rb

@@ -16,7 +16,7 @@ class LogStash::Outputs::RabbitMQ
       @connected = java.util.concurrent.atomic.AtomicBoolean.new
 
       connect
-      declare_exchange
+      @x = declare_exchange
 
       @connected.set(true)
 
@@ -29,18 +29,15 @@ class LogStash::Outputs::RabbitMQ
 
       begin
         @codec.encode(event)
-      rescue JSON::GeneratorError => e
-        @logger.warn("Trouble converting event to JSON", :exception => e,
-                     :event => event)
+      rescue => e
+        @logger.warn("Error encoding event", :exception => e, :event => event)
       end
     end
 
-    def publish_serialized(message)
+    def publish_serialized(event, message)
       begin
         if @connected.get
-          @x.publish(message, :routing_key => @key, :properties => {
-            :persistent => @persistent
-          })
+          @x.publish(message, :routing_key => event.sprintf(@key), :properties => { :persistent => @persistent })
         else
           @logger.warn("Tried to send a message, but not connected to RabbitMQ.")
         end
@@ -131,12 +128,12 @@ class LogStash::Outputs::RabbitMQ
     def declare_exchange
       @logger.debug("Declaring an exchange", :name => @exchange, :type => @exchange_type,
                     :durable => @durable)
-      @x = @ch.exchange(@exchange, :type => @exchange_type.to_sym, :durable => @durable)
+      x = @ch.exchange(@exchange, :type => @exchange_type.to_sym, :durable => @durable)
 
       # sets @connected to true during recovery. MK.
       @connected.set(true)
 
-      @x
+      x
     end
 
   end # MarchHareImpl

data/logstash-output-rabbitmq.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-rabbitmq'
-  s.version         = '0.1.1'
+  s.version         = '0.1.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Push events to 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"
@@ -30,5 +30,7 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-input-generator'
+  s.add_development_dependency 'logstash-codec-json'
 end
 

data/spec/outputs/rabbitmq_spec.rb

@@ -1 +1,72 @@
-require "logstash/devutils/rspec/spec_helper"
+require "logstash/devutils/rspec/spec_helper"
+
+require "logstash/pipeline"
+require "logstash/outputs/rabbitmq"
+
+describe LogStash::Outputs::RabbitMQ do
+
+  describe "rabbitmq static key" do
+    config <<-END
+      input {
+        generator {
+          count => 1
+        }
+      }
+      output {
+        rabbitmq {
+          host => "localhost"
+          exchange_type => "topic"
+          exchange => "foo"
+          key => "bar"
+        }
+      }
+    END
+
+    it "should use defined key" do
+      exchange = double("exchange")
+      expect_any_instance_of(LogStash::Outputs::RabbitMQ).to receive(:connect).and_return(nil)
+      expect_any_instance_of(LogStash::Outputs::RabbitMQ).to receive(:declare_exchange).and_return(exchange)
+
+      expect(exchange).to receive(:publish).with(an_instance_of(String), {:routing_key => "bar", :properties => {:persistent => true}})
+
+      # we need to set expectations before running the pipeline, this is why we cannot use the
+      # "agent" spec construct here so we do it manually
+      pipeline = LogStash::Pipeline.new(config)
+      pipeline.run
+    end
+
+  end
+
+  describe "rabbitmq key with dynamic field" do
+    config <<-END
+      input {
+        generator {
+          count => 1
+          add_field => ["foo", "bar"]
+        }
+      }
+      output {
+        rabbitmq {
+          host => "localhost"
+          exchange_type => "topic"
+          exchange => "foo"
+          key => "%{foo}"
+        }
+      }
+    END
+
+    it "should populate the key with the content of the event foo field" do
+      exchange = double("exchange")
+      expect_any_instance_of(LogStash::Outputs::RabbitMQ).to receive(:connect).and_return(nil)
+      expect_any_instance_of(LogStash::Outputs::RabbitMQ).to receive(:declare_exchange).and_return(exchange)
+
+      expect(exchange).to receive(:publish).with(an_instance_of(String), {:routing_key => "bar", :properties => {:persistent => true}})
+
+      # we need to set expectations before running the pipeline, this is why we cannot use the
+      # "agent" spec construct here so we do it manually
+      pipeline = LogStash::Pipeline.new(config)
+      pipeline.run
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: java
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,34 @@ dependencies:
     - - '>='
       - !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
+  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 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
 email: info@elasticsearch.com
 executables: []