logstash-input-file 4.1.13 → 4.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 256f10c0054f1cabe7fde22c6522dc3c1cf92c169b2584e9e05de977891aab09
-  data.tar.gz: 96ff5670352287242b9ec116ee4b4bd5051e5256f00bcdf1ef0ef8fba3115c0b
+  metadata.gz: ab5ec7dc0c6834c28679c38d676abab3e80ffda7df079e038d5fcebaf2a90afb
+  data.tar.gz: 4cdc46401d7f16db0f152cfb4da918e35ea0ebc255451526040fdc4e7225705a
 SHA512:
-  metadata.gz: ed265f6a90f677a66c6dcd5823d10e043b1be2c9836e1f5001d3ae4485a1f4496bc8ae4d34781ed79cda6778a8362c2e97b34d41161a0ec3248e10ac70b4c77f
-  data.tar.gz: b776efe42fb2eadf40b39ce5ba031e4686295b19baaeb20b50608ece46143acd8515e49c65028a5ccb0c0e3732011dcff194f535e4fd9c64b4076f5423a711d9
+  metadata.gz: 206db97684f6a7a4a45e56235da12e828d280b500c16ed7bab8d7a3d994dc881d28d9912d664cd9d185b338b7dfd13de47fdd02173935974223b8374281501a9
+  data.tar.gz: 74fc9bed35c6f9666b04f88ccf1418faa6f3013c540fb9b40c7da59e925d562ba17d3d4bda34d2f510f24304c965c112b480af5c0b42a96a276113b35e7f24eb

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.1.14
+  - Fixed bug in delete of multiple watched files [#254](https://github.com/logstash-plugins/logstash-input-file/pull/254)
+
 ## 4.1.13
   - Fixed sinceDB to work spaces filename [#249](https://github.com/logstash-plugins/logstash-input-file/pull/249)
 

data/lib/filewatch/watched_files_collection.rb

@@ -19,6 +19,7 @@ module FileWatch
       Array(paths).each do |f|
         index = @pointers.delete(f)
         @files.delete_at(index)
+        refresh_pointers
       end
       @sort_method.call
     end

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '4.1.13'
+  s.version         = '4.1.14'
   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/tailing_spec.rb

@@ -90,7 +90,7 @@ module FileWatch
       end
     end
 
-    context "when watching a directory with files, exisiting content is skipped" do
+    context "when watching a directory with files, existing content is skipped" do
       let(:suffix) { "C" }
       let(:actions) do
         RSpec::Sequencing
@@ -100,11 +100,11 @@ module FileWatch
           .then_after(0.1, "begin watching") do
             tailing.watch_this(watch_dir)
           end
-          .then_after(0.2, "add content") do
+          .then_after(2, "add content") do
             File.open(file_path, "ab") { |file|  file.write("line1\nline2\n") }
           end
           .then("wait") do
-            wait(0.75).for{listener1.lines.size}.to eq(2)
+            wait(0.75).for{listener1.lines}.to eq(["line1", "line2"])
           end
           .then("quit") do
             tailing.quit

data/spec/filewatch/watched_files_collection_spec.rb

@@ -4,12 +4,15 @@ require_relative 'spec_helper'
 module FileWatch
   describe WatchedFilesCollection do
     let(:time) { Time.now }
+    let(:filepath1){"/var/log/z.log"}
+    let(:filepath2){"/var/log/m.log"}
+    let(:filepath3){"/var/log/a.log"}
     let(:stat1)  { double("stat1", :size => 98, :modified_at => time - 30, :identifier => nil, :inode => 234567, :inode_struct => InodeStruct.new("234567", 3, 2)) }
     let(:stat2)  { double("stat2", :size => 99, :modified_at => time - 20, :identifier => nil, :inode => 234568, :inode_struct => InodeStruct.new("234568", 3, 2)) }
     let(:stat3)  { double("stat3", :size => 100, :modified_at => time, :identifier => nil, :inode => 234569, :inode_struct => InodeStruct.new("234569", 3, 2)) }
-    let(:wf1) { WatchedFile.new("/var/log/z.log", stat1, Settings.new) }
-    let(:wf2) { WatchedFile.new("/var/log/m.log", stat2, Settings.new) }
-    let(:wf3) { WatchedFile.new("/var/log/a.log", stat3, Settings.new) }
+    let(:wf1) { WatchedFile.new(filepath1, stat1, Settings.new) }
+    let(:wf2) { WatchedFile.new(filepath2, stat2, Settings.new) }
+    let(:wf3) { WatchedFile.new(filepath3, stat3, Settings.new) }
 
     context "sort by last_modified in ascending order" do
       let(:sort_by) { "last_modified" }
@@ -70,5 +73,23 @@ module FileWatch
         expect(collection.values).to eq([wf1, wf2, wf3])
       end
     end
+
+    context "when delete called" do
+      let(:sort_by) { "path" }
+      let(:sort_direction) { "desc" }
+
+      it "is able to delete multiple files at once" do
+        collection = described_class.new(Settings.from_options(:file_sort_by => sort_by, :file_sort_direction => sort_direction))
+        collection.add(wf1)
+        collection.add(wf2)
+        collection.add(wf3)
+        expect(collection.keys).to eq([filepath1, filepath2, filepath3])
+
+        collection.delete([filepath2,filepath3])
+        expect(collection.keys).to eq([filepath1])
+
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 4.1.13
+  version: 4.1.14
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement