logstash-input-file 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39708420cb297cae2205c5e2ef4e595f2b1652f0
-  data.tar.gz: 405f93ecc407455518f14fb9d16544e9357733b6
+  metadata.gz: 2d89bec9a19e18572d601c3b575da6a64b510c96
+  data.tar.gz: eea01181084e3bfbae9fa715ab614e464c13bd64
 SHA512:
-  metadata.gz: c2460287157dd990831b5f91717f9004c9eb2af6469d73a15596ab029eb0579941c5a7d10a392e8e857cd02d2c84fe22e5b830d1d44ec7fba8789ba69e86bb32
-  data.tar.gz: 2fea4c08d6adcd180f920bf33083292d1d06a6bb9b209d67a5f150d4c6f800667ed230484df139f7b0bc0542fe2689b068e6b3f129981bbefcc8dfc312b22438
+  metadata.gz: f47663e174c96a356f8674d7677c3b07a478a1eb9200135aef4bac7d3885a53218254f07a71208d1d96e94704d79ad6a3e6ad4a36f917668526be7d03e584413
+  data.tar.gz: ef3a21a9cc3e66ebdee1b48912fe63b2d5283aec4f090f78acc103df9e2e667b050ccbe08c0484b31713cdc8166ada8321fd38256c697be8f97008c9d88f6653

data/CHANGELOG.md

@@ -1,7 +1,3 @@
-## 1.0.2
- - Using filewatch >= 0.6.7, tail.quit closes files. Only one set of file
- handles are used if run is called more than once.
-
 ## 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/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-gemspec
-
-gem 'concurrent-ruby', '0.9.1'
+gemspec

data/lib/logstash/inputs/file.rb

@@ -183,15 +183,12 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
     end
   end # def register
 
-  def begin_tailing
-    teardown   # if the pipeline restarts this input.
+  public
+  def run(queue)
     @tail = FileWatch::Tail.new(@tail_config)
     @tail.logger = @logger
     @path.each { |path| @tail.tail(path) }
-  end
 
-  def run(queue)
-    begin_tailing
     @tail.subscribe do |path, line|
       @logger.debug? && @logger.debug("Received line", :path => path, :text => line)
       @codec.decode(line) do |event|
@@ -202,14 +199,10 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
         queue << event
       end
     end
-    finished
   end # def run
 
   public
-  def teardown
-    # in filewatch >= 0.6.7, quit will close and forget all files
-    # but it will write their last read positions to since_db
-    # beforehand
-    @tail.quit if @tail
-  end # def teardown
+  def stop
+    @tail.quit if @tail # _sincedb_write is called implicitly
+  end
 end # class LogStash::Inputs::File

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '1.0.2'
+  s.version         = '2.0.0'
   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"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0.alpha0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'addressable'
-  s.add_runtime_dependency 'filewatch', ['>= 0.6.7', '~> 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', '= 0.0.15'
+  s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-codec-json'
 end
 

data/spec/inputs/file_spec.rb

@@ -5,18 +5,19 @@ require "tempfile"
 require "stud/temporary"
 require "logstash/inputs/file"
 
-describe "inputs/file" do
-  before(:all) do
-    @abort_on_exception = Thread.abort_on_exception
-    Thread.abort_on_exception = true
-  end
-
-  after(:all) do
-    Thread.abort_on_exception = @abort_on_exception
-  end
+describe LogStash::Inputs::File do
 
   delimiter = (LogStash::Environment.windows? ? "\r\n" : "\n")
 
+  it_behaves_like "an interruptible input plugin" do
+    let(:config) do
+      {
+        "path" => Stud::Temporary.pathname,
+        "sincedb_path" => Stud::Temporary.pathname
+      }
+    end
+  end
+
   it "should starts at the end of an existing file" do
     tmpfile_path = Stud::Temporary.pathname
     sincedb_path = Stud::Temporary.pathname
@@ -188,45 +189,4 @@ describe "inputs/file" do
       expect { subject.register }.to raise_error(ArgumentError)
     end
   end
-
-  context "when #run is called multiple times", :unix => true do
-    let(:tmpdir_path)  { Stud::Temporary.directory }
-    let(:sincedb_path) { Stud::Temporary.pathname }
-    let(:file_path)    { "#{tmpdir_path}/a.log" }
-    let(:buffer)       { [] }
-    let(:lsof)         { [] }
-    let(:stop_proc) do
-      lambda do |input, arr|
-        Thread.new(input, arr) do |i, a|
-          sleep 0.5
-          a << `lsof -p #{Process.pid} | grep "a.log"`
-          i.teardown
-        end
-      end
-    end
-
-    subject { LogStash::Inputs::File.new("path" => tmpdir_path + "/*.log", "start_position" => "beginning", "sincedb_path" => sincedb_path) }
-
-    after :each do
-      FileUtils.rm_rf(tmpdir_path)
-      FileUtils.rm_rf(sincedb_path)
-    end
-    before do
-      File.open(file_path, "w") do |fd|
-        fd.puts('foo')
-        fd.puts('bar')
-      end
-    end
-    it "should only have one set of files open" do
-      subject.register
-      lsof_before = `lsof -p #{Process.pid} | grep #{file_path}`
-      expect(lsof_before).to eq("")
-      stop_proc.call(subject, lsof)
-      subject.run(buffer)
-      expect(lsof.first).not_to eq("")
-      stop_proc.call(subject, lsof)
-      subject.run(buffer)
-      expect(lsof.last).to eq(lsof.first)
-    end
-  end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha0
+        version: 2.0.0.snapshot
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha0
+        version: 2.0.0.snapshot
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -63,7 +57,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.5
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -74,7 +68,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.5
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -95,17 +89,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: '0'
   name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -126,14 +120,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/file.rb
 - logstash-input-file.gemspec
 - spec/inputs/file_spec.rb
@@ -159,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Stream events from files.

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"