logstash-filter-grok 3.2.4 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b034532a205ad23ce96a26ec94a38168714f89b5
-  data.tar.gz: 864f130d2549eeafff4c1f4b5fdd8ab6e2646bab
+  metadata.gz: c5390fc2b96b4cd54b12e4553bcdd1371595a5e9
+  data.tar.gz: 7fe06830c1466f85e6df82f50ca8fb6947be2ac9
 SHA512:
-  metadata.gz: edd8cfade5fef7b64a5199c500574db16848de04fade4cabbfae9c58f07667cc94c23a41ed117f383c683baf44ec06b1b6aeb1048349ca620d147f0139d1d2e7
-  data.tar.gz: 1753891e587a891e65cb57b540814d619192a9bf5ef1d71fedb703207e9d5004fd1da26f3cd0725430620555e5bad05b19c2d3b43ef0e79ab937298e71e5931f
+  metadata.gz: 3f747a46733715b5c8872a04c9b0b778707fbd2b76eded7c4036f7516a813dca10139c55eb81b94ce0b1c2f3023aed2d02e079d976c3f61783f45d83e7a106c2
+  data.tar.gz: a73926c240474e52832f18215e02ae92170b2e5e97642f8c148be891dceacaf39bf7345cd7e347c63b985c219be56030e10993c572ae6bca9b8d5fa37ec9d1ce

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.3.0
+  - Allow timeout enforcer to be disabled by setting timeout_millis to nil
+  - Change default timeout_millis to 30s
+
 ## 3.2.4
   - Fix mutex interruption bug that could crash logstash. See: https://github.com/logstash-plugins/logstash-filter-grok/issues/97
 

data/lib/logstash/filters/grok.rb

@@ -199,7 +199,8 @@
     # This applies per pattern if multiple patterns are applied
     # This will never timeout early, but may take a little longer to timeout.
     # Actual timeout is approximate based on a 250ms quantization.
-    config :timeout_millis, :validate => :number, :default => 2000
+    # Set to 0 to disable timeouts
+    config :timeout_millis, :validate => :number, :default => 30000
 
     # Tag to apply if a grok regexp times out.
     config :tag_on_timeout, :validate => :string, :default => '_groktimeout'
@@ -238,7 +239,7 @@
       @handlers = {}
 
       @timeout_enforcer = TimeoutEnforcer.new(@logger, @timeout_millis * 1000000)
-      @timeout_enforcer.start!
+      @timeout_enforcer.start! unless @timeout_millis == 0
     end
 
     public
@@ -300,7 +301,7 @@
       end
 
       @logger.debug? and @logger.debug("Event now: ", :event => event)
-    rescue ::LogStash::Filters::Grok::TimeoutException => e      
+    rescue ::LogStash::Filters::Grok::TimeoutException => e
       @logger.warn(e.message)
       metric.increment(:timeouts)
       event.tag(@tag_on_timeout)

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

@@ -5,7 +5,7 @@ class LogStash::Filters::Grok::TimeoutEnforcer
 
   def initialize(logger, timeout_nanos)
     @logger = logger
-    @running = true
+    @running = false
     @timeout_nanos = timeout_nanos
 
     # Stores running matches with their start time, this is used to cancel long running matches
@@ -32,6 +32,7 @@ class LogStash::Filters::Grok::TimeoutEnforcer
   end
 
   def start!
+    @running = true
     @timer_thread = Thread.new do
       while @running
         begin

data/logstash-filter-grok.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-grok'
-  s.version         = '3.2.4'
+  s.version         = '3.3.0'
   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

@@ -409,9 +409,9 @@ describe LogStash::Filters::Grok do
 
   describe "timeout on failure" do
     config <<-CONFIG
-      filter { 
+      filter {
         grok {
-          match => { 
+          match => {
             message => "(.*a){30}"
           }
           timeout_millis => 100
@@ -821,15 +821,28 @@ describe LogStash::Filters::Grok do
     end
   end
 
-  describe "closing" do    
+  describe "opening/closing" do
+    let(:config) { {"match" => {"message" => "A"}} }
     subject(:plugin) do
-      ::LogStash::Filters::Grok.new("match" => {"message" => "A"})
+      ::LogStash::Filters::Grok.new(config)
     end
 
     before do
       plugin.register
     end
 
+    it "should start the timeout enforcer" do
+      expect(plugin.timeout_enforcer.running).to be true
+    end
+
+    context "with the timeout enforcer disabled" do
+      let(:config) { super.merge("timeout_millis" => 0) }
+
+      it "should not start the timeout enforcer" do
+        expect(plugin.timeout_enforcer.running).to be false
+      end
+    end
+
     it "should close cleanly" do
       expect { plugin.do_close }.not_to raise_error
     end

metadata

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