logstash-input-beats 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc82edf516cc926764c9bf592b6b4240d2b250a
-  data.tar.gz: afd96ca6287561a27ef83d1e5070785cc507da00
+  metadata.gz: 3394e299d7c7ecf132134ebed27de22b49d2bdc2
+  data.tar.gz: 3e92f0bdb6b00a5d28955673a647099dfe905d4e
 SHA512:
-  metadata.gz: 9a4d8d3e817adaad0e49659c713ba864e2d32837ca39a751cb78d026bc71b215564048e7db7912934a551ff60c0aa2dc3ae52ae06b5f9ee4d4bd25814e4277f2
-  data.tar.gz: 0416a16c50b648351929119370f8ea513ff2dfd1657afd47b7332e6ef3758c3381505ce639ba122790024a638272dd91e766f43fd0cd277143b32e66382f7578
+  metadata.gz: 3e2456b1703cf75ab2724fa61014d8dc0e1b56bdaf05045ab06bef319f0511a99de7627bb581c39e2296d9468c7f2399a770c2c59f115de6a7353b0cfca46605
+  data.tar.gz: 3ce48912d957e5539ba445b0580ef7e312f0d57b961a40247146fbf63d72778a2035bbb1ed25ceb0f3904b5ff4c06d7cb20373961a926d3a36161fcf7f503289

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.1.2
+  - Catch the `java.lang.InterruptedException` in the events broker
+  - Give a bit more time to the Thread to be started in the test #42
 # 2.1.1
   - Release a new version of the gem that doesn't included any other gems, 2.1.0 is yanked from rubygems 
 # 2.1.0

data/lib/logstash/inputs/beats.rb

@@ -217,9 +217,9 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
         while !stop?
           @output_queue << @buffered_queue.take
         end
-      rescue InterruptionException => e
+      rescue java.lang.InterruptedException => e
         # If we are shutting down without waiting the queue to unblock
-        # we will get an `InterruptionException` in that context we will not log it.
+        # we will get an `java.lang.InterruptionException` in that context we will not log it.
         @logger.error("Beats input: bufferered queue exception", :exception => e) unless stop?
       rescue => e
         @logger.error("Beats input: unexpected exception", :exception => e)

data/logstash-input-beats.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "logstash-input-beats"
-  s.version         = "2.1.1"
+  s.version         = "2.1.2"
   s.licenses        = ["Apache License (2.0)"]
   s.summary         = "Receive events using the lumberjack protocol."
   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"

data/spec/inputs/beats_spec.rb

@@ -93,7 +93,9 @@ describe LogStash::Inputs::Beats do
         plugin.run(pipeline_queue)
       end
 
-      sleep(0.1) until t.status == "run"
+      # Give a bit of time to the server to correctly 
+      # start the thread.
+      sleep(1) 
     end
 
     after :each do
@@ -107,12 +109,16 @@ describe LogStash::Inputs::Beats do
       end
 
       it "calls flush on the handler and tag the events" do
-        expect(connection_handler).to receive(:accept) { raise LogStash::Inputs::Beats::InsertingToQueueTakeTooLong }
-        expect(connection_handler).to receive(:flush).and_yield(LogStash::Event.new)
-        plugin.handle_new_connection(connection)
-
-        event = pipeline_queue.shift
-        expect(event["tags"]).to include("beats_input_flushed_by_end_of_connection")
+        # try multiples times to make sure the 
+        # thread containing the `#run` is correctly started.
+        try do
+          expect(connection_handler).to receive(:accept) { raise LogStash::Inputs::Beats::InsertingToQueueTakeTooLong }
+          expect(connection_handler).to receive(:flush).and_yield(LogStash::Event.new)
+          plugin.handle_new_connection(connection)
+
+          event = pipeline_queue.shift
+          expect(event["tags"]).to include("beats_input_flushed_by_end_of_connection")
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Elastic