logstash-input-file 4.1.12 → 4.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7a99266c87fd0a7279a20334fbcf34844bd15bd5602b1011add91f512cd2816
-  data.tar.gz: 8b913a6f8ccf185dfd0aa325a41f6902c958caf2e496b71c9d5b635d090d383b
+  metadata.gz: 256f10c0054f1cabe7fde22c6522dc3c1cf92c169b2584e9e05de977891aab09
+  data.tar.gz: 96ff5670352287242b9ec116ee4b4bd5051e5256f00bcdf1ef0ef8fba3115c0b
 SHA512:
-  metadata.gz: dd40437784392572ebfd2c0bba20676ae5dfdb3ea3079d706c19e7202c557b55157a614392bd2430b7acee2e875c3ae2d3dd25ac057e2d6e6209c3946a446f8f
-  data.tar.gz: b37cb04b73602dc63b9931810ee93402bde5f2599f937c4b74824168e3f4692442da6d8da5b29f8928131bae172d5a374fb0f74b2139958624525fe4373833ae
+  metadata.gz: ed265f6a90f677a66c6dcd5823d10e043b1be2c9836e1f5001d3ae4485a1f4496bc8ae4d34781ed79cda6778a8362c2e97b34d41161a0ec3248e10ac70b4c77f
+  data.tar.gz: b776efe42fb2eadf40b39ce5ba031e4686295b19baaeb20b50608ece46143acd8515e49c65028a5ccb0c0e3732011dcff194f535e4fd9c64b4076f5423a711d9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.1.13
+  - Fixed sinceDB to work spaces filename [#249](https://github.com/logstash-plugins/logstash-input-file/pull/249)
+
 ## 4.1.12
   - Fix regression in `exclude` handling. Patterns are matched against the filename, not full path.
     [Issue #237](https://github.com/logstash-plugins/logstash-input-file/issues/237)

data/README.md

@@ -37,6 +37,11 @@ bundle install
 
 ```sh
 bundle install
+```
+
+ - Build the jar library used for watching files
+```bash
+./gradlew build
 ```
 
 - Run tests

data/lib/filewatch/sincedb_record_serializer.rb

@@ -51,7 +51,7 @@ module FileWatch
       inode_struct = prepare_inode_struct(parts)
       pos = parts.shift.to_i
       expires_at = Float(parts.shift) # this is like Time.now.to_f
-      path_in_sincedb = parts.shift
+      path_in_sincedb = parts.join(" ")
       value = SincedbValue.new(pos, expires_at).add_path_in_sincedb(path_in_sincedb)
       [inode_struct, value]
     end

data/logstash-input-file.gemspec

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

@@ -9,30 +9,55 @@ module FileWatch
     let(:io) { StringIO.new }
     let(:db) { Hash.new }
 
-    subject { described_class.new(Settings.days_to_seconds(14)) }
+    subject { SincedbRecordSerializer.new(Settings.days_to_seconds(14)) }
 
     context "deserialize from IO" do
       it 'reads V1 records' do
-        io.write("5391299 1 4 12\n")
+        io.write("5391297 1 4 12\n")
+        io.rewind
+        rows = 0
         subject.deserialize(io) do |inode_struct, sincedb_value|
-          expect(inode_struct.inode).to eq("5391299")
+          expect(inode_struct.inode).to eq("5391297")
           expect(inode_struct.maj).to eq(1)
           expect(inode_struct.min).to eq(4)
           expect(sincedb_value.position).to eq(12)
+          rows += 1
         end
+        expect(rows).to be > 0
       end
 
       it 'reads V2 records from an IO object' do
         now = Time.now.to_f
-        io.write("5391299 1 4 12 #{now} /a/path/to/1.log\n")
+        io.write("5391298 1 4 12 #{now} /a/path/to/1.log\n")
+        io.rewind
+        rows = 0
         subject.deserialize(io) do |inode_struct, sincedb_value|
-          expect(inode_struct.inode).to eq("5391299")
+          expect(inode_struct.inode).to eq("5391298")
           expect(inode_struct.maj).to eq(1)
           expect(inode_struct.min).to eq(4)
           expect(sincedb_value.position).to eq(12)
           expect(sincedb_value.last_changed_at).to eq(now)
           expect(sincedb_value.path_in_sincedb).to eq("/a/path/to/1.log")
+          rows += 1
         end
+        expect(rows).to be > 0
+      end
+
+      it 'properly handles spaces in a filename' do
+        now = Time.now.to_f
+        io.write("53912987 1 4 12 #{now} /a/path/to/log log.log\n")
+        io.rewind
+        rows = 0
+        subject.deserialize(io) do |inode_struct, sincedb_value|
+          expect(inode_struct.inode).to eq("53912987")
+          expect(inode_struct.maj).to eq(1)
+          expect(inode_struct.min).to eq(4)
+          expect(sincedb_value.position).to eq(12)
+          expect(sincedb_value.last_changed_at).to eq(now)
+          expect(sincedb_value.path_in_sincedb).to eq("/a/path/to/log log.log")
+          rows += 1
+        end
+        expect(rows).to be > 0
       end
     end
 

metadata

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