logstash-input-stomp 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40903a4e976bc127ff8626222a2ecd098a937099
-  data.tar.gz: 17d0ec2bb78f62899ea0f3eacaa137b831a7f85d
+  metadata.gz: 68117f4113aa4a4902cb64977cb39d7fe88dd7bd
+  data.tar.gz: 4ac677fb36cb57017286f47504832615693478be
 SHA512:
-  metadata.gz: 0627d11825ee37f8a8d8070bedb80d4146e8f4888ff1d0c220e25a3ee090619c80a6a6be140e0598ccc098e48df2d5f47d8860f50f464eaecf5f94b612a4ee64
-  data.tar.gz: 4aae38021b6dbef1ffe38d1b4d25913bb09b9a1c285a0023342db59d3a9d17a679fee8a36ef6b7034237b2370a8dd5676f02696f2d5a25df54d6e9226c5f3c74
+  metadata.gz: 127e2e00f45257a518175f4686a4358c91f78ea6cc750ebb8a783dd3fd2b2c339cb43e9140c59120b6638221948940ccc98c91c4765061e0a73f40901cefb7fe
+  data.tar.gz: b54f4532a6c3d00bef14598d313b5e678131fb86e036b4f68eab306114ce5741e0e498bd910ede688546fd893c21001780f25c910028668f19c689ccbd6c7912

data/CHANGELOG.md

@@ -1,5 +1,7 @@
+## 2.0.3
+ - Bugfix https://github.com/logstash-plugins/logstash-input-stomp/issues/10
+
 ## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  - Dependency on logstash-core update to 2.0
-

data/CONTRIBUTORS

@@ -1,6 +1,10 @@
 The following is a list of people who have contributed ideas, code, bug
 reports, or in general have helped logstash along its way.
 
+Maintainers:
+
+* Philippe Weber (wiibaa)
+
 Contributors:
 * Aaron Mildenstein (untergeek)
 * Brice Figureau (masterzen)

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-stomp-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-stomp-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/stomp.rb

@@ -36,10 +36,10 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
   private
   def connect
     begin
-      client.connect
-      @logger.debug("Connected to stomp server") if client.connected?
-    rescue => e
-      @logger.debug("Failed to connect to stomp server, will retry", :exception => e, :backtrace => e.backtrace)
+      @client.connect
+      @logger.debug? && @logger.debug("Connected to stomp server") if @client.connected?
+    rescue OnStomp::ConnectFailedError, OnStomp::UnsupportedProtocolVersionError=> e
+      @logger.warn("Failed to connect to stomp server, will retry", :exception => e, :backtrace => e.backtrace)
       if stop?
         sleep 2
         retry
@@ -50,12 +50,12 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
   public
   def register
     require "onstomp"
-    client = new_client
-    client.host = @vhost if @vhost
+    @client = new_client
+    @client.host = @vhost if @vhost
     @stomp_url = "stomp://#{@user}:#{@password}@#{@host}:#{@port}/#{@destination}"
 
-    # Handle disconnects 
-    client.on_connection_closed {
+    # Handle disconnects
+    @client.on_connection_closed {
       connect
       subscription_handler # is required for re-subscribing to the destination
     }
@@ -68,7 +68,7 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
 
   private
   def subscription_handler
-    client.subscribe(@destination) do |msg|
+    @client.subscribe(@destination) do |msg|
       @codec.decode(msg.body) do |event|
         decorate(event)
         @output_queue << event
@@ -87,7 +87,7 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
 
   public
   def run(output_queue)
-    @output_queue = output_queue 
+    @output_queue = output_queue
     subscription_handler
   end # def run
 end # class LogStash::Inputs::Stomp

data/logstash-input-stomp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-stomp'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Pull events from a stomp server"
   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"
@@ -27,4 +27,3 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
 end
-

data/spec/inputs/stomp_spec.rb

@@ -2,14 +2,43 @@ require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/stomp"
 
 describe LogStash::Inputs::Stomp do
+  let(:klass) { LogStash::Inputs::Stomp }
+  let(:host) { "localhost" }
+  let(:destination) { "/foo" }
+  let(:stomp_settings) {
+    {
+      "host" => host,
+      "destination" => destination
+    }
+  }
+  let(:instance) { klass.new(stomp_settings) }
+
+  context "when connected" do
+    let(:client) { double("client") }
+
+    before do
+      allow(instance).to receive(:new_client).and_return(client)
+      allow(client).to receive(:connect)
+      allow(client).to receive(:connected?).and_return(true)
+      allow(client).to receive(:on_connection_closed)
+    end
+
+    it "should register without error" do
+      instance.register
+    end
+  end
+
   describe "stopping" do
     let(:config) { {"host" => "localhost", "destination" => "/foo"} }
     let(:client) { double("client") }
     before do
-      subject.client = client
+      allow(subject).to receive(:new_client).and_return(client)
       allow(subject).to receive(:connect)
+      allow(client).to receive(:connect)
+      allow(client).to receive(:connected?).and_return(true)
+      allow(client).to receive(:on_connection_closed)
       allow(client).to receive(:subscribe)
     end
     it_behaves_like "an interruptible input plugin"
   end
-end
+end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-stomp
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-01-20 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,48 +28,50 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: onstomp
   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: onstomp
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   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-devutils
   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@elastic.co
 executables: []