logstash-filter-grok 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34c685833867a04238f8544429c5938cd58a696
-  data.tar.gz: 096eb04af33607c064d210c9e007ffbfccb3a9fa
+  metadata.gz: 26ce02b49c1b5bf27a1ea5470cef3b2875fa73e6
+  data.tar.gz: 936454b6cf21105471e21ed161835d722a9092c2
 SHA512:
-  metadata.gz: b7aacf53f2a102c96c65597710b529ef0acef10730358ae4c5d4fd32c9dd053e5f226a2696535921fccc75504f205c8580762287ead404d413359bac8e9758f1
-  data.tar.gz: 61bfb20dbb5452b957e08e82b5ad54d8b1f89d50dcdd2d0ba6bd37f7e06b2f630e2d92247ddd9e81de7fcefba720f12a3a32b5a21edb99eafb9d6a57331b7b54
+  metadata.gz: 2723677afeb369af6e1555b308b11c24ee4cb9f6c1baf6b74fc2fdedcff3e4d09702bcabf1532a2738134850eaa9f4c9821daf3f230df02f0a2c8bed66f701eb
+  data.tar.gz: 2625317a10db35a9de2905ba534bfa80bbf7d6df031122077e180e252d0dc20ea1bfdaa46e62ada24894150502275c007c6706ef3433bb5a02735c45189b26c2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.1
+  - Fix race condition in TimeoutEnforcer that could cause crashes
+  - Fix shutdown code to close cleanly and properly close the enforcer
+
 ## 3.2.0
   - Add new timeout options to cancel grok execution if a threshold time is exceeded
 

data/lib/logstash/filters/grok.rb

@@ -222,6 +222,8 @@
     # will be parsed and `hello world` will overwrite the original message.
     config :overwrite, :validate => :array, :default => []
 
+    attr_reader :timeout_enforcer
+    
     # Register default pattern paths
     @@patterns_path ||= Set.new
     @@patterns_path += [
@@ -390,7 +392,7 @@
     end # def add_patterns_from_files
 
     def close
-      @timeout_handler.stop!
+      @timeout_enforcer.stop!
     end
 
   end # class LogStash::Filters::Grok

data/lib/logstash/filters/grok/timeout_enforcer.rb

@@ -1,4 +1,6 @@
 class LogStash::Filters::Grok::TimeoutEnforcer
+  attr_reader :running
+  
   def initialize(logger, timeout_nanos)
     @logger = logger
     @running = true
@@ -42,12 +44,14 @@ class LogStash::Filters::Grok::TimeoutEnforcer
   end
 
   def cancel_timed_out!
-    @threads_to_start_time.each do |thread,start_time|
-      now = java.lang.System.nanoTime # save ourselves some nanotime calls
-      elapsed = java.lang.System.nanoTime - start_time
-      if elapsed > @timeout_nanos
-        elapsed_millis = elapsed / 1000
-        thread.raise(::LogStash::Filters::Grok::TimeoutException.new(elapsed_millis))
+    @timer_mutex.synchronize do
+      @threads_to_start_time.each do |thread,start_time|
+        now = java.lang.System.nanoTime # save ourselves some nanotime calls
+        elapsed = java.lang.System.nanoTime - start_time
+        if elapsed > @timeout_nanos
+          elapsed_millis = elapsed / 1000
+          thread.raise(::LogStash::Filters::Grok::TimeoutException.new(elapsed_millis))
+        end
       end
     end
   end

data/logstash-filter-grok.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-grok'
-  s.version         = '3.2.0'
+  s.version         = '3.2.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Parse arbitrary text and structure it."
   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/filters/grok_spec.rb

@@ -821,4 +821,23 @@ describe LogStash::Filters::Grok do
     end
   end
 
+  describe "closing" do    
+    subject(:plugin) do
+      ::LogStash::Filters::Grok.new("match" => {"message" => "A"})
+    end
+
+    before do
+      plugin.register
+    end
+
+    it "should close cleanly" do
+      expect { plugin.do_close }.not_to raise_error
+    end
+
+    it "should stop the timeout enforcer" do
+      plugin.do_close
+      expect(plugin.timeout_enforcer.running).to be false
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-grok
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement