logstash-input-stomp 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503865c8c2b88f201914aac8cb164194e50efeb2
-  data.tar.gz: 7aa43e6a686c31ab5a8b31ea48c6391f5c14f64d
+  metadata.gz: b99721a442817dbc133e72433f9522f0db4139b9
+  data.tar.gz: 307485148adf50b3e1a78fc4c4b8e5d3074a7dc2
 SHA512:
-  metadata.gz: d32ac232a7c72502e94f3309232c8f25b8925338e5a64556f1ca671abc8b42d51495c28e8ccb9538996f6bd95c2b7cfb58afa772e8a5f44eb0dc7b2eeb0d6090
-  data.tar.gz: 63681a165a9668be4cb33c1235b46b5b09a8d2d35af79a5554984bde087a4e98437e38c8dfbc75735616af98bb173e410acfd4fa998f305a789dc99d337ce09e
+  metadata.gz: dea43df7013a335009bc0cd673731837480dda5d92a958a30844b6260a35f294c4c4d105001311155da78456e1f6b6b081db9cf3039a6ceedbd484784d22c803
+  data.tar.gz: afdf310ac9ca54a69ebccc88a76ef7290134036a5792c11595adbbd1ec57680da0b946329f95ac5dd3cd6a7b0bca09aa83396b81d5d18c14f4e25b9d56b64381

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.6
+  - Wait till pipeline is in run state to connect. Before this patch this plugin
+    could block logstash indefinitely due to a connect method that never finishes.
+
 ## 3.0.5
   - Fix some documentation issues
 

data/lib/logstash/inputs/stomp.rb

@@ -46,15 +46,15 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
       @client.connect
       @logger.info("Connected to stomp server") if @client.connected?
     rescue OnStomp::ConnectFailedError, OnStomp::UnsupportedProtocolVersionError, Errno::ECONNREFUSED => e      
-      if @reconnect
-	@logger.warn("Failed to connect to stomp server. Retry in #{@reconnect_interval} seconds. #{e.inspect}")
-	@logger.debug("#{e.backtrace.join("\n")}") if @debug
-	sleep @reconnect_interval
+      if @reconnect && !stop?
+        @logger.warn("Failed to connect to stomp server. Retry in #{@reconnect_interval} seconds. #{e.inspect}")
+        @logger.debug("#{e.backtrace.join("\n")}") if @debug
+        sleep @reconnect_interval
         retry
       end
+
       @logger.warn("Failed to connect to stomp server. Exiting with error: #{e.inspect}")
       @logger.debug("#{e.backtrace.join("\n")}") if @debug
-      stop?
     end
   end
 
@@ -65,14 +65,6 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
     @client = new_client
     @client.host = @vhost if @vhost
     @stomp_url = "stomp://#{@user}:#{@password}@#{@host}:#{@port}/#{@destination}"
-
-    # Handle disconnects
-    @client.on_connection_closed {
-      connect
-      subscription_handler # is required for re-subscribing to the destination
-    }
-
-    connect
   end # def register
 
   def new_client
@@ -103,7 +95,18 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
 
   public
   def run(output_queue)
+    # Handle disconnects
+    @client.on_connection_closed {
+      self.connect
+      subscription_handler # is required for re-subscribing to the destination
+    }
+
+    connect
     @output_queue = output_queue
     subscription_handler
   end # def run
+
+  def stop
+    @client.disconnect if @client && @client.connected?
+  end
 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         = '3.0.5'
+  s.version         = '3.0.6'
   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/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/stomp_spec.rb

@@ -2,7 +2,6 @@ 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) {
@@ -11,34 +10,37 @@ describe LogStash::Inputs::Stomp do
       "destination" => destination
     }
   }
-  let(:instance) { klass.new(stomp_settings) }
+  subject(:instance) { described_class.new(stomp_settings) }
+  let(:client) { double("client") }
 
-  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
+  before do
+    allow(instance).to receive(:new_client).and_return(client)
+    allow(client).to receive(:on_connection_closed)
+    allow(instance).to receive(:new_client).and_return(client)
+  end
 
+  context "when registered" do
     it "should register without error" do
       instance.register
     end
   end
 
-  describe "stopping" do
-    let(:config) { {"host" => "localhost", "destination" => "/foo"} }
-    let(:client) { double("client") }
+  context "connecting and disconnecting" do
     before do
-      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)
+      allow(client).to receive(:disconnect)
+    end
+
+    it "should connect and disconnect" do
+      instance.register
+      t = Thread.new { instance.run(Queue.new) }
+      sleep 5
+      expect(client).to have_received(:connect)
+      instance.do_stop
+      expect(client).to have_received(:disconnect)
+      t.join
     end
-    it_behaves_like "an interruptible input plugin"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-stomp
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement