logstash-input-file 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5319e9eb1c38b91734226b4eb97bbc7ee84e3eec
-  data.tar.gz: 47903b7f1ba56c91baa61acd29af2f1cb7961d21
+  metadata.gz: c56f2ba7106f61178bb34833bef500378352d39e
+  data.tar.gz: 8234370a6b5d313ff1057d5a6ea638cba656a83a
 SHA512:
-  metadata.gz: e03a060ea74cfbf4ae2cfc18bfe6517b6dd83dd68c2f5a36674136ca00fa30375c4c2a55a7d77acc7e26437fba9680bb40ce73f17064417c514f44cf93896639
-  data.tar.gz: 4c7bcf126d12d903ef633ebe5042e31dd9d16d27091232a6bc5222a0cfa6268a6dbb0eb4dd17bab271019d75c2682bd8d659a6a931770f04828900f7c64c2d6c
+  metadata.gz: d64a4bd6c7610a1678244a016c7c97cceacf460f71b39a975d4a9954aabd33593bd8280a0833b3a5be57f94e0db1b23d4d2372a82ec611132a75f2aa4d415a7f
+  data.tar.gz: 4e86dc4b6b5c3c8fd70cf02e85e91ca02623199177fbeb29fd9be40821181a83f996d46076291e78a501e7c1ad0f7882471c474147c736368b588977129ce8f3

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 1.0.1
+ - Force dependency on filewatch >= 0.6.5 that fixes a sincedb bug
+ - Better documentation and error handling regarding the "sincedb_path" parameter

data/lib/logstash/inputs/file.rb

@@ -46,9 +46,10 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
   # How often (in seconds) we expand globs to discover new files to watch.
   config :discover_interval, :validate => :number, :default => 15
 
-  # Where to write the sincedb database (keeps track of the current
-  # position of monitored log files). The default will write
-  # sincedb files to some path matching `$HOME/.sincedb*`
+  # Path of the sincedb database file (keeps track of the current
+  # position of monitored log files) that will be written to disk.
+  # The default will write sincedb files to some path matching `$HOME/.sincedb*`
+  # NOTE: it must be a file path and not a directory path
   config :sincedb_path, :validate => :string
 
   # How often (in seconds) to write a since database with the current position of
@@ -120,6 +121,10 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
                    :sincedb_path => @sincedb_path, :path => @path)
     end
 
+    if File.directory?(@sincedb_path)
+      raise ArgumentError.new("The \"sincedb_path\" argument must point to a file, received a directory: \"#{@sincedb_path}\"")
+    end
+
     @tail_config[:sincedb_path] = @sincedb_path
 
     if @start_position == "beginning"

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '1.0.0'
+  s.version         = '1.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream 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/plugin install gemname. This gem is not a stand-alone program"
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'addressable'
-  s.add_runtime_dependency 'filewatch', ['>= 0.6.4', '~> 0.6']
+  s.add_runtime_dependency 'filewatch', ['>= 0.6.5', '~> 0.6']
 
   s.add_development_dependency 'stud', ['~> 0.0.19']
   s.add_development_dependency 'logstash-devutils'

data/spec/inputs/file_spec.rb

@@ -3,6 +3,7 @@
 require "logstash/devutils/rspec/spec_helper"
 require "tempfile"
 require "stud/temporary"
+require "logstash/inputs/file"
 
 describe "inputs/file" do
 
@@ -165,4 +166,18 @@ describe "inputs/file" do
     insist { events[1]["path"] } == "#{tmpfile_path}"
     insist { events[1]["host"] } == "#{Socket.gethostname.force_encoding(Encoding::UTF_8)}"
   end
+
+  context "when sincedb_path is an existing directory" do
+    let(:tmpfile_path) { Stud::Temporary.pathname }
+    let(:sincedb_path) { Stud::Temporary.directory }
+    subject { LogStash::Inputs::File.new("path" => tmpfile_path, "sincedb_path" => sincedb_path) }
+
+    after :each do
+      FileUtils.rm_rf(sincedb_path)
+    end
+
+    it "should raise exception" do
+      expect { subject.register }.to raise_error(ArgumentError)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -64,7 +64,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Stream events from files.