logstash-input-file 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7dc40f218316d0466dc4e5195095a197f08a079e2ecdf7f8f6c24bb86bf1fa1
-  data.tar.gz: e44ef70fc261926779276c04010ea32326988648a535d9088af691835153ebcb
+  metadata.gz: f4177a21fb94dc920a0226ca698ed1bf5a6d96203a2582de150f1b1984b6ab8d
+  data.tar.gz: 8cdbb99975efb2bda21ed8d1745f5f5f668a6275c89e35718e2a312365cdfd5a
 SHA512:
-  metadata.gz: 6fb28fc538b07df9b7a39d0cdfa47979afee706bc98b7d718bbc43080e1ab7ce49492cca594f9a07876aa52cca7db1ca81fe47243bc9500af6ab565a2a0568e1
-  data.tar.gz: e13d85b4050710ba6fcd7492bf961ef4b6814bb4ba723642d3b96ae56a3e6291724ce893984cfb62e64b2c7225263ef1d49ed656f676afd48be1cf47df60a59a
+  metadata.gz: 4552c42974950d4f9490a13883ab77118e21b1f54fa1b7d3cfd83e99191660f15811df0364fe4ee8948fbffa7370aacc67ddc965dc2d02b44992586392bd9b63
+  data.tar.gz: '00287236b17611e36d6754a265507aa6a31c18e76152e4265853ca7e1c36870865d298e66db905b87dd860b769f754a745abbf4f74eafb2511f91341d3a71c2a'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.1.1
+  - Fix JAR_VERSION read problem, prevented Logstash from starting.
+    [Issue #180](https://github.com/logstash-plugins/logstash-input-file/issues/180)
+  - Fix sincedb write error when using /dev/null, repeatedly causes a plugin restart.
+    [Issue #182](https://github.com/logstash-plugins/logstash-input-file/issues/182)
+
 ## 4.1.0
   - Move Filewatch code into the plugin folder, rework Filewatch code to use
     Logstash facilities like logging and environment.

data/lib/filewatch/bootstrap.rb

@@ -30,7 +30,7 @@ module FileWatch
     end
   end
 
-  jar_version = IO.read("JAR_VERSION").strip
+  jar_version = Pathname.new(__FILE__).dirname.join("../../JAR_VERSION").realpath.read.strip
 
   require "java"
   require_relative "../../lib/jars/filewatch-#{jar_version}.jar"

data/lib/filewatch/sincedb_collection.rb

@@ -207,7 +207,7 @@ module FileWatch
     end
 
     def non_atomic_write
-      IO.open(@full_path, 0) do |io|
+      IO.open(IO.sysopen(@full_path, "w+")) do |io|
         @serializer.serialize(@sincedb, io)
       end
     end

data/logstash-input-file.gemspec

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

@@ -55,6 +55,22 @@ module FileWatch
       end
     end
 
+    context "when watching a directory with files and sincedb_path is /dev/null or NUL" do
+      let(:directory) { Stud::Temporary.directory }
+      let(:sincedb_path) { File::NULL }
+      let(:watch_dir) { ::File.join(directory, "*.log") }
+      let(:file_path) { ::File.join(directory, "1.log") }
+
+      it "the file is read" do
+        File.open(file_path, "wb") { |file|  file.write("line1\nline2\n") }
+        actions.activate
+        reading.watch_this(watch_dir)
+        reading.subscribe(observer)
+        expect(observer.listener_for(file_path).calls).to eq([:open, :accept, :accept, :eof, :delete])
+        expect(observer.listener_for(file_path).lines).to eq(["line1", "line2"])
+      end
+    end
+
     context "when watching a directory with files using striped reading" do
       let(:directory) { Stud::Temporary.directory }
       let(:watch_dir) { ::File.join(directory, "*.log") }

metadata

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