logstash-input-file 4.4.5 → 4.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 063f72c89ee45f05e386433cc55b797597ceed3fbda22f37dc1034275e8e9530
-  data.tar.gz: fe76691a8f46897b716aa9dca6a9420896e619d85f1ca1e12181e1b6f0f5765a
+  metadata.gz: 45943ffe3b08260710657d17a321d0129e1c836f8840473297813753dc359436
+  data.tar.gz: 5792827bd08cbbfc22ba53f70b1d41db69d90c00bf97fbd13878198743117aee
 SHA512:
-  metadata.gz: 9416e24b57cc632d9182fee5d082f6ca58a31da78f97f013fb07af4b877d341508911a8eb418ef782493c0146f9f04a6477471ab5fa180f3398667426b37e098
-  data.tar.gz: bdda74f5fd273e5fee2ab9b15bda33491cc6c8afded19b501df97afffcbb14623c698a109d466d430119d88c04be4649a51892fb5a8f9e09f0ad395ec64d64a4
+  metadata.gz: 3efb12ff1e4074c2a4d61052f126dc28759189c019b6ef1013b3363a64bb6b9b4b61dec477cef6bf4332709b3e843abfc705a97eb9f2e2b24872eec8fcb82883
+  data.tar.gz: 3e391cba34af69e98c0300a7cd16289275648d49904e3d2518ce225a6551f606d4c091c011ce16eefef74a1c1789e14ce032c900ac57f4fce0c908d0057d31ce

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.4.7
+  - Re-packaging the plugin [#331](https://github.com/logstash-plugins/logstash-input-file/pull/331)
+
+## 4.4.6
+  - Change read mode to immediately stop consuming buffered lines when shutdown is requested [#322](https://github.com/logstash-plugins/logstash-input-file/pull/322)
+
 ## 4.4.5
   - Handle EOF when checking archive validity [#321](https://github.com/logstash-plugins/logstash-input-file/pull/321)
 

data/lib/filewatch/read_mode/handlers/read_file.rb

@@ -54,6 +54,7 @@ module FileWatch module ReadMode module Handlers
             # sincedb position is independent from the watched_file bytes_read
             delta = line.bytesize + @settings.delimiter_byte_size
             sincedb_collection.increment(watched_file.sincedb_key, delta)
+            break if quit?
           end
         rescue EOFError => e
           log_error("controlled_read: eof error reading file", watched_file, e)

data/logstash-input-file.gemspec

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

@@ -5,13 +5,13 @@ describe FileWatch::BufferedTokenizer do
 
   context "when using the default delimiter" do
     it "splits the lines correctly" do
-      expect(subject.extract("hello\nworld\n")).to eq ["hello", "world"]
+      expect(subject.extract("hello\nworld\n").to_a).to eq ["hello", "world"]
     end
 
     it "holds partial lines back until a token is found" do
       buffer = described_class.new
-      expect(buffer.extract("hello\nwor")).to eq ["hello"]
-      expect(buffer.extract("ld\n")).to eq ["world"]
+      expect(buffer.extract("hello\nwor").to_a).to eq ["hello"]
+      expect(buffer.extract("ld\n").to_a).to eq ["world"]
     end
   end
 
@@ -19,7 +19,7 @@ describe FileWatch::BufferedTokenizer do
     subject { FileWatch::BufferedTokenizer.new("\r\n") }
 
     it "splits the lines correctly" do
-      expect(subject.extract("hello\r\nworld\r\n")).to eq ["hello", "world"]
+      expect(subject.extract("hello\r\nworld\r\n").to_a).to eq ["hello", "world"]
     end
   end
 end

data/spec/helpers/spec_helper.rb

@@ -51,7 +51,24 @@ module FileInput
     end
   end
 
+  class NullObject
+    def respond_to_missing?(method_name, include_private = false)
+      true
+    end
+    def method_missing(method_name, *args, **kwargs, &block)
+      nil
+    end
+  end
+
+  module MockLoggable
+    def self.included(base)
+      mock_logger = NullObject.new
+      base.define_method(:logger) { mock_logger }
+    end
+  end
+
   class CodecTracer < TracerBase
+    include MockLoggable
     def decode_accept(ctx, data, listener)
       @tracer.push [:decode_accept, [ctx, data]]
       listener.process(ctx, {"message" => data})

data/spec/inputs/file_read_spec.rb

@@ -181,25 +181,27 @@ describe LogStash::Inputs::File do
     end
 
     context "for a compressed file" do
+      let(:tmp_directory) { Stud::Temporary.directory }
+      let(:all_files_path) { fixture_dir.join("compressed.*.*") }
+      let(:gz_file_path) { fixture_dir.join('compressed.log.gz') }
+      let(:gzip_file_path) { fixture_dir.join('compressed.log.gzip') }
+      let(:sincedb_path) { ::File.join(tmp_directory, "sincedb.db") }
+      let(:log_completed_path) { ::File.join(tmp_directory, "completed.log") }
+
       it "the file is read" do
-        file_path = fixture_dir.join('compressed.log.gz')
-        file_path2 = fixture_dir.join('compressed.log.gzip')
-        FileInput.make_fixture_current(file_path.to_path)
-        FileInput.make_fixture_current(file_path2.to_path)
-        tmpfile_path = fixture_dir.join("compressed.*.*")
-        directory = Stud::Temporary.directory
-        sincedb_path = ::File.join(directory, "readmode_C_sincedb.txt")
-        log_completed_path = ::File.join(directory, "C_completed.txt")
+        FileInput.make_fixture_current(gz_file_path.to_path)
+        FileInput.make_fixture_current(gzip_file_path.to_path)
 
         conf = <<-CONFIG
         input {
           file {
             type => "blah"
-            path => "#{tmpfile_path}"
+            path => "#{all_files_path}"
             sincedb_path => "#{sincedb_path}"
             mode => "read"
             file_completed_action => "log"
             file_completed_log_path => "#{log_completed_path}"
+            exit_after_read => true
           }
         }
         CONFIG
@@ -216,17 +218,11 @@ describe LogStash::Inputs::File do
       end
 
       it "the corrupted file is untouched" do
-        directory = Stud::Temporary.directory
-        file_path = fixture_dir.join('compressed.log.gz')
-        corrupted_file_path = ::File.join(directory, 'corrupted.gz')
-        FileUtils.cp(file_path, corrupted_file_path)
+        corrupted_file_path = ::File.join(tmp_directory, 'corrupted.gz')
+        FileUtils.cp(gz_file_path, corrupted_file_path)
 
         FileInput.corrupt_gzip(corrupted_file_path)
 
-        log_completed_path = ::File.join(directory, "C_completed.txt")
-        f = File.new(log_completed_path, "w")
-        f.close()
-
         conf = <<-CONFIG
         input {
           file {
@@ -236,28 +232,23 @@ describe LogStash::Inputs::File do
             file_completed_action => "log_and_delete"
             file_completed_log_path => "#{log_completed_path}"
             check_archive_validity => true
+            exit_after_read => true
           }
         }
         CONFIG
 
-        events = input(conf) do |pipeline, queue|
+        input(conf) do |pipeline, queue|
           wait(1)
           expect(IO.read(log_completed_path)).to be_empty
         end
       end
 
       it "the truncated file is untouched" do
-        directory = Stud::Temporary.directory
-        file_path = fixture_dir.join('compressed.log.gz')
-        truncated_file_path = ::File.join(directory, 'truncated.gz')
-        FileUtils.cp(file_path, truncated_file_path)
+        truncated_file_path = ::File.join(tmp_directory, 'truncated.gz')
+        FileUtils.cp(gz_file_path, truncated_file_path)
 
         FileInput.truncate_gzip(truncated_file_path)
 
-        log_completed_path = ::File.join(directory, "C_completed.txt")
-        f = File.new(log_completed_path, "w")
-        f.close()
-
         conf = <<-CONFIG
         input {
           file {
@@ -267,11 +258,12 @@ describe LogStash::Inputs::File do
             file_completed_action => "log_and_delete"
             file_completed_log_path => "#{log_completed_path}"
             check_archive_validity => true
+            exit_after_read => true
           }
         }
         CONFIG
 
-        events = input(conf) do |pipeline, queue|
+        input(conf) do |pipeline, queue|
           wait(1)
           expect(IO.read(log_completed_path)).to be_empty
         end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 4.4.5
+  version: 4.4.7
 platform: ruby
 authors:
 - Elastic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,9 +19,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,154 +30,154 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: addressable
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: concurrent-ruby
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-multiline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: logstash-codec-multiline
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-mixin-ecs_compatibility_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  name: logstash-mixin-ecs_compatibility_support
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.19
-  name: stud
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.19
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-sequencing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-sequencing
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-wait
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-wait
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: timecop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -267,7 +266,6 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -282,8 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Streams events from files
 test_files: