logstash-codec-multiline 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb29402e4fc64969af12f38713f553e18dc57418
-  data.tar.gz: f8a9fb89870cc25e7a252b11c47e7c5e5dc94eb7
+  metadata.gz: 36df6112f2d0e3f3d6b3d0481a72e5250fae5352
+  data.tar.gz: b86e58bbb8f62680e7ab478adc0d75a3d61d6530
 SHA512:
-  metadata.gz: 89e537074ac1b46b495e0ae0a926abed3a9609ef906f519e70b3b68753b4ecdebb6e4ef04cd8d926a535fc65ac2335677b85cba500d5061dbbe9e8c68364aaca
-  data.tar.gz: 76e16b208297f0bbeb47bb8f00daabd8b89017d7a4181478e06e72b19bfa73c99e7065ad6cc9e229786d772298c7eb0eea936f68f953aa3cbdb62ce42f12a690
+  metadata.gz: afe492266d2d77c9946ff76ad71e755f8d03a655222f92673f70d0804b99543edd82dbb3365674f1f640036eb24cb42c6f3b65d6bea290378e959de6f6356bfe
+  data.tar.gz: e053998e3802437a06a82b5997f28c8bc4983b80c936a1d9bbbe3b81a4a99be11f6086dac0f01a73c69fb2770728ee6ef030f807714c226a7e570815d11c49d2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.7
+ - Fix for issue #23, Thread deadlock on auto-flush when using multiple inputs with this codec. Use cancel + execute on ScheduledTask instead of reset.
+
 ## 2.0.6
  - Isolate spec helper classes in their own namespace.
 

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
-gemspec
+gemspec
+gem "concurrent-ruby", "0.9.1"

data/lib/logstash/codecs/auto_flush.rb

@@ -7,20 +7,48 @@ module LogStash module Codecs class AutoFlush
     @stopped = Concurrent::AtomicBoolean.new # false by default
   end
 
+  # def start
+  #   # can't start if pipeline is stopping
+  #   return self if stopped?
+  #   if pending?
+  #     @task.cancel
+  #     create_task
+  #   elsif finished?
+  #     create_task
+  #   # else the task is executing
+  #   end
+  #   self
+  # end
+
   def start
     # can't start if pipeline is stopping
     return self if stopped?
-    if pending?
-      @task.reset
-    elsif finished?
-      @task = Concurrent::ScheduledTask.execute(@interval) do
-        @mc.auto_flush()
-      end
-    # else the task is executing
+
+    if pending? && @task.cancel
+      create_task
+      return self
+    end
+    # maybe we have a timing edge case
+    # where pending? was true but cancel failed
+    # because the task started running
+    if finished?
+      create_task
+      return self
     end
+    # else the task is executing
+    # wait for task to complete
+    # flush could feasibly block on queue access
+    @task.value
+    create_task
     self
   end
 
+  def create_task
+    @task = Concurrent::ScheduledTask.execute(@interval) do
+      @mc.auto_flush()
+    end
+  end
+
   def finished?
     return true if @task.nil?
     @task.fulfilled?
@@ -36,6 +64,10 @@ module LogStash module Codecs class AutoFlush
 
   def stop
     @stopped.make_true
+    cancel
+  end
+
+  def cancel
     @task.cancel if pending?
   end
 end
@@ -63,4 +95,8 @@ class AutoFlushUnset
   def stop
     self
   end
+
+  def cancel
+    self
+  end
 end end end

data/lib/logstash/codecs/multiline.rb

@@ -129,7 +129,7 @@ module LogStash module Codecs class Multiline < LogStash::Codecs::Base
 
   # The accumulation of multiple lines will be converted to an event when either a
   # matching new line is seen or there has been no new data appended for this time
-  # auto_flush_interval. No default.  If unset, no auto_flush
+  # auto_flush_interval. No default.  If unset, no auto_flush. Units: seconds
   config :auto_flush_interval, :validate => :number
 
   public
@@ -195,10 +195,7 @@ module LogStash module Codecs class Multiline < LogStash::Codecs::Base
 
   def buffer(text)
     @buffer_bytes += text.bytesize
-    @buffer.push(text).tap do |b|
-      # do start but preserve the return value
-      auto_flush_runner.start
-    end
+    @buffer.push(text)
   end
 
   def flush(&block)
@@ -247,11 +244,13 @@ module LogStash module Codecs class Multiline < LogStash::Codecs::Base
 
   def do_next(text, matched, &block)
     buffer(text)
+    auto_flush_runner.start
     flush(&block) if !matched || buffer_over_limits?
   end
 
   def do_previous(text, matched, &block)
     flush(&block) if !matched || buffer_over_limits?
+    auto_flush_runner.start
     buffer(text)
   end
 

data/logstash-codec-multiline.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-multiline'
-  s.version         = '2.0.6'
+  s.version         = '2.0.7'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The multiline codec will collapse multiline messages and merge them into a single event."
   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"

metadata

@@ -1,77 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-multiline
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-patterns-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-patterns-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jls-grok
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.1
+  name: jls-grok
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
+- !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: []
@@ -104,12 +104,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []