logstash-input-file 4.1.14 → 4.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5ec7dc0c6834c28679c38d676abab3e80ffda7df079e038d5fcebaf2a90afb
-  data.tar.gz: 4cdc46401d7f16db0f152cfb4da918e35ea0ebc255451526040fdc4e7225705a
+  metadata.gz: a3c11c5972a494975b2acfa7d7e4f67e0ca4720ff9ec78c864febf764c9b030b
+  data.tar.gz: f80d8c34dd0848c07029199a6c57d39e25c343e32c499ecb4d350bfd50564119
 SHA512:
-  metadata.gz: 206db97684f6a7a4a45e56235da12e828d280b500c16ed7bab8d7a3d994dc881d28d9912d664cd9d185b338b7dfd13de47fdd02173935974223b8374281501a9
-  data.tar.gz: 74fc9bed35c6f9666b04f88ccf1418faa6f3013c540fb9b40c7da59e925d562ba17d3d4bda34d2f510f24304c965c112b480af5c0b42a96a276113b35e7f24eb
+  metadata.gz: '00392e4f07fe9fdfd732419c4b56b680f5b07aa7e97149ba7af91bca8aee128f396ef2330ec46814b7b3fbc9b52fcc58766a27d50b72bbf28c9b7475dc0aeda0'
+  data.tar.gz: 76079df610dfe177fd5c538b8ff5325d064f97826af30d441bd9abe54bfc1197f2178ba88862d6f144540a776493cce44efe130119ee8cc8e39c14492203f534

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.1.15
+  - Fixed bug in conversion of sincedb_clean_after setting [#257](https://github.com/logstash-plugins/logstash-input-file/pull/257)
+
 ## 4.1.14
   - Fixed bug in delete of multiple watched files [#254](https://github.com/logstash-plugins/logstash-input-file/pull/254)
 

data/lib/filewatch/settings.rb

@@ -13,10 +13,6 @@ module FileWatch
       new.add_options(opts)
     end
 
-    def self.days_to_seconds(days)
-      (24 * 3600) * days.to_f
-    end
-
     def initialize
       defaults = {
         :delimiter => "\n",
@@ -51,7 +47,7 @@ module FileWatch
       @file_chunk_count = @opts[:file_chunk_count]
       @sincedb_path = @opts[:sincedb_path]
       @sincedb_write_interval = @opts[:sincedb_write_interval]
-      @sincedb_expiry_duration =  self.class.days_to_seconds(@opts.fetch(:sincedb_clean_after, 14))
+      @sincedb_expiry_duration =  @opts.fetch(:sincedb_clean_after)
       @file_sort_by = @opts[:file_sort_by]
       @file_sort_direction = @opts[:file_sort_direction]
       self

data/lib/filewatch/sincedb_record_serializer.rb

@@ -5,13 +5,17 @@ module FileWatch
 
     attr_reader :expired_keys
 
+    def self.days_to_seconds(days)
+      (24 * 3600) * days.to_f
+    end
+
     def initialize(sincedb_value_expiry)
       @sincedb_value_expiry = sincedb_value_expiry
       @expired_keys = []
     end
 
     def update_sincedb_value_expiry_from_days(days)
-      @sincedb_value_expiry = Settings.days_to_seconds(days)
+      @sincedb_value_expiry = SincedbRecordSerializer.days_to_seconds(days)
     end
 
     def serialize(db, io, as_of = Time.now.to_f)

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '4.1.14'
+  s.version         = '4.1.15'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Streams events from files"
   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/filewatch/settings_spec.rb

@@ -0,0 +1,11 @@
+describe FileWatch::Settings do
+
+  context "when create from options" do
+    it "doesn't convert sincedb_clean_after to seconds" do
+      res = FileWatch::Settings.from_options({:sincedb_clean_after => LogStash::Inputs::FriendlyDurations.call(1, "days").value})
+
+      expect(res.sincedb_expiry_duration).to eq 1 * 24 * 3600
+    end
+  end
+
+end

data/spec/filewatch/sincedb_record_serializer_spec.rb

@@ -9,7 +9,7 @@ module FileWatch
     let(:io) { StringIO.new }
     let(:db) { Hash.new }
 
-    subject { SincedbRecordSerializer.new(Settings.days_to_seconds(14)) }
+    subject { SincedbRecordSerializer.new(SincedbRecordSerializer.days_to_seconds(14)) }
 
     context "deserialize from IO" do
       it 'reads V1 records' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 4.1.14
+  version: 4.1.15
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +214,7 @@ files:
 - spec/filewatch/read_mode_handlers_read_file_spec.rb
 - spec/filewatch/reading_spec.rb
 - spec/filewatch/rotate_spec.rb
+- spec/filewatch/settings_spec.rb
 - spec/filewatch/sincedb_record_serializer_spec.rb
 - spec/filewatch/spec_helper.rb
 - spec/filewatch/tailing_spec.rb
@@ -263,6 +264,7 @@ test_files:
 - spec/filewatch/read_mode_handlers_read_file_spec.rb
 - spec/filewatch/reading_spec.rb
 - spec/filewatch/rotate_spec.rb
+- spec/filewatch/settings_spec.rb
 - spec/filewatch/sincedb_record_serializer_spec.rb
 - spec/filewatch/spec_helper.rb
 - spec/filewatch/tailing_spec.rb