logstash-input-lumberjack 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b273f528393d8084ada814564a4c80c064c89cb5
-  data.tar.gz: b9d12a73e7ce5197b418fa3cdcb0c607339d0f3e
+  metadata.gz: 6439998770b842a2295277eb852f74c538a33e8d
+  data.tar.gz: 7d7fb7d8bc8afdb4780c53b1322e41b5c667bf2f
 SHA512:
-  metadata.gz: 0209b47c888b247cb1027f17be8518f3fe0ccea69f237b3a1c009133ddfde0a6d06ea6cf84292c016ee3e54b88fc8f5983773f7f7e7a33378b7f3e24870e73dc
-  data.tar.gz: be5fc6c8d217343290162fa049ccaeb446dcb56edc432cb519eb39d2b2d7f22fae69c4af5d048fd962097c54d1dd1c8ef5e9094cffc2feb3f7b6ffb8fa12920a
+  metadata.gz: 4e58cf8471ba746773cdfe347781c587cb64e70ee468a7ba6f699f0aa872209409db18c8862f6a452e1cf7e2c912650d0bf358a989ab7c0c1abbfd7ab469c6f0
+  data.tar.gz: 291db828aa1a19663e38fad3b11db54ad842a685cad3a2f9fc5c5ff00adce5e72159f72c8364eae44224e8d9f2620c146874d090f487bc7002c18463cf65f099

data/CHANGELOG.md

@@ -1,6 +1,8 @@
-## 2.0.0
+## 2.0.2
  - 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
+
+## 2.0.0
  - Dependency on logstash-core update to 2.0
 
 # 1.0.5

data/lib/logstash/inputs/lumberjack.rb

@@ -68,12 +68,17 @@ class LogStash::Inputs::Lumberjack < LogStash::Inputs::Base
   def run(output_queue)
     start_buffer_broker(output_queue)
 
-    while true do
+    while !stop? do
       # Wrappingu the accept call into a CircuitBreaker
       if @circuit_breaker.closed?
-        connection = @lumberjack.accept # Blocking call that creates a new connection
-
+        connection = @lumberjack.accept # call that creates a new connection
+        next if connection.nil? # if the connection is nil the connection was close.
         invoke(connection, @codec.clone) do |_codec, line, fields|
+          if stop?
+            connection.close
+            break
+          end
+
           _codec.decode(line) do |event|
             begin
               decorate(event)
@@ -89,12 +94,13 @@ class LogStash::Inputs::Lumberjack < LogStash::Inputs::Base
         sleep(RECONNECT_BACKOFF_SLEEP)
       end
     end
-  rescue LogStash::ShutdownSignal
-    @logger.info("Lumberjack input: received ShutdownSignal")
-  ensure
-    shutdown(output_queue)
   end # def run
 
+  public
+  def stop
+    @lumberjack.close
+  end
+
   private
   def invoke(connection, codec, &block)
     @threadpool.post do
@@ -121,7 +127,7 @@ class LogStash::Inputs::Lumberjack < LogStash::Inputs::Base
 
   def start_buffer_broker(output_queue)
     @threadpool.post do
-      while true
+      while !stop?
         output_queue << @buffered_queue.pop_no_timeout
       end
     end

data/logstash-input-lumberjack.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-lumberjack'
-  s.version         = '2.0.1'
+  s.version         = '2.0.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/lumberjack_spec.rb

@@ -47,4 +47,8 @@ describe LogStash::Inputs::Lumberjack do
       end
     end
   end
+
+  context "when interrupting the plugin" do
+    it_behaves_like "an interruptible input plugin"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-lumberjack
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement