logstash-input-stomp 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4293d31a3983f8e3d725a1870d1323a4046b9833
-  data.tar.gz: 75d2befc5b089e4b8cee5257547f9f89d9dbf5a5
+  metadata.gz: d79f4d09d75532cd89359ffe00ae511381ad60eb
+  data.tar.gz: e3812a2a26382bbc655fce229902257a1fe41ccb
 SHA512:
-  metadata.gz: 78fa6d68fb804449df107c64355ea839ce030cd4832c0a700373160d135f3cb89c007157695af437057b893ed0b77e1cc00622f53b0eb2faad47c73c940997fd
-  data.tar.gz: b80496e211785f4cfb022cf0989a905a34b0eb91218e50cfe50febdf1b5e21f688d61333e03ff593995b7f78cdbc58beda7785c2f30bc9798bb5192f31911d7d
+  metadata.gz: ad205f5b802e08ca657346ee9e7077081c8467e41f187729caeb7a91be8346f659a505d10f28981cc453d6023e00ddbf3bdc2f5d67da0ad18b49f49ecad43698
+  data.tar.gz: c096335c508f8a569bfbfe3a55e22761280005bae19a1c5f6afe1f2b073699c583e6467a131d248bfee7bedbb372b0673c885af7af96da1fef9f7c06ecc5ce99

data/CHANGELOG.md

@@ -1,12 +1,18 @@
+# 3.0.2
+ - Added support for reconnecting when the broker is not available
+
 ## 3.0.1
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 
 # 3.0.0 (2016-05-20)
   - Breaking: Updated to use new Java APIs
+
 # 2.0.5
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+
 # 2.0.4
   - New dependency requirements for logstash-core for the 5.0 release
+
 ## 2.0.3
  - Bugfix https://github.com/logstash-plugins/logstash-input-stomp/issues/10
 

data/lib/logstash/inputs/stomp.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
-require 'pp'
+require "pp"
 
 class LogStash::Inputs::Stomp < LogStash::Inputs::Base
   attr_accessor :client
@@ -30,6 +30,12 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
   # The vhost to use
   config :vhost, :validate => :string, :default => nil
 
+  # Auto reconnect
+  config :reconnect, :validate => :boolean, :default => true
+  
+  #Auto reconnect interval in seconds
+  config :reconnect_interval, :validate => :number, :default => 30
+
   # Enable debugging output?
   config :debug, :validate => :boolean, :default => false
 
@@ -37,19 +43,24 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
   def connect
     begin
       @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
+      @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
         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
 
   public
   def register
     require "onstomp"
+	
     @client = new_client
     @client.host = @vhost if @vhost
     @stomp_url = "stomp://#{@user}:#{@password}@#{@host}:#{@port}/#{@destination}"
@@ -59,6 +70,7 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
       connect
       subscription_handler # is required for re-subscribing to the destination
     }
+
     connect
   end # def register
 
@@ -68,6 +80,9 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
 
   private
   def subscription_handler
+    #Exit function when connection is not active
+    return if !@client.connected?
+
     @client.subscribe(@destination) do |msg|
       @codec.decode(msg.body) do |event|
         decorate(event)

data/logstash-input-stomp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-stomp'
-  s.version         = '3.0.1'
+  s.version         = '3.0.2'
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-stomp
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Pull events from a stomp server