logstash-filter-contains 1.0.0-java → 1.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34c2672e7b79ed2fade7c9eaa406023435edae44
-  data.tar.gz: 987c6c08d7ec7b1e8729eba02ef16f0b9712f7b9
+  metadata.gz: 5887c99f4cb8a3b3784d585068e4a05ff4f1f5dd
+  data.tar.gz: 24d1d040e6e7fb12e5494a7a10cc7882cab800f1
 SHA512:
-  metadata.gz: d12a48998e71d7228a178a29c785fdb9ef011cf438a586c2f65a09769af7f1f9a4dadc7fade39fafccc568e3acfce8b79fc9213712b945877d16779fff64302e
-  data.tar.gz: 37746e2b3f644f4aa3e7e533f7e44f1591754ecdd8100fde9db8249a90fbfd633ff51902ecbed02efff533e6a76d12ec6dd993a3aa93e279bc875fa0945ab80e
+  metadata.gz: a93b060bdb5efbadc1c72473c65f142a3db41928b7260d80438d72dfeb6e1928fbbe4524ff037688a411a265a5b1ab7991bf0817bd0381e458b9a8ba03efe130
+  data.tar.gz: 410a17c9310f6555a6e8bf18cba3ed5c83a01713303f662090b1a1c246e100be175fe96084d4673a1704102cfec74cac3476887394340b13186d65f137294935

data/lib/logstash/filters/contains.rb

@@ -72,8 +72,11 @@ class LogStash::Filters::CONTAINS < LogStash::Filters::Base
     end
 
     if @value_path
-      @next_refresh = Time.now + @refresh_interval
-      lock_for_write { load_file }
+      lock_for_write { 
+        load_file
+        @last_mtime = File.mtime(@value_path)
+        @next_refresh = Time.now() + @refresh_interval
+      }
     end
   end # def register
 
@@ -86,7 +89,7 @@ class LogStash::Filters::CONTAINS < LogStash::Filters::Base
     end
   end # def lock_for_write
 
-  def lock_for_read #ensuring only one thread updates the network block list
+  def lock_for_read #ensuring only one thread updates the value block list
     @read_lock.lock
     begin
       yield
@@ -96,11 +99,21 @@ class LogStash::Filters::CONTAINS < LogStash::Filters::Base
   end #def lock_for_read
 
   def needs_refresh?
-    @next_refresh < Time.now
+    if @next_refresh < Time.now
+      if @last_mtime != File.mtime(@value_path)
+        return true
+      else
+        @next_refresh = Time.now + @refresh_interval
+        return false
+      end
+    else
+      return false
+    end
   end # def needs_refresh
 
   def load_file
     begin
+      @logger.debug("load_file called")
       temporary = File.open(@value_path, "r") {|file| file.read.split(@separator)}
       if !temporary.empty? #ensuring the file was parsed correctly
         @value_set = temporary.to_set
@@ -115,7 +128,7 @@ class LogStash::Filters::CONTAINS < LogStash::Filters::Base
           "logstash.agent.configuration.invalid_plugin_register",
           :plugin => "filter",
           :type => "contains",
-          :error => "The file containing the network list is invalid, please check the separator character or permissions for the file."
+          :error => "The file containing the value list is invalid, please check the separator character or permissions for the file."
         )
       end
     end
@@ -139,6 +152,7 @@ class LogStash::Filters::CONTAINS < LogStash::Filters::Base
           if needs_refresh?
             load_file
             @next_refresh = Time.now() + @refresh_interval
+            @last_mtime = File.mtime(@value_path)
           end
         end #end lock
       end #end refresh from file

data/logstash-filter-contains.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-contains'
-  s.version         = '1.0.0'
+  s.version         = '1.0.1'
   s.platform        = 'java'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "filter to check if value is contains"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-contains
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors:
 - donghyeon kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api