logstash-input-file 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 500b3f380c635a24f90fb21353d1c84bd4576185
-  data.tar.gz: b0d2d72dbdfec41017aacf5841c8894af02ce62c
+  metadata.gz: 3031f11a86bcbaedf755db41a40cf9dd9dbf92b4
+  data.tar.gz: d259988e1d462a8a106f7b112196cbf2f1170f52
 SHA512:
-  metadata.gz: ba1fae63082f89706dfa6d41d03bba866bcc5056e6777639c9bf7065c4da75298a6b8f1e5be0e4f32d434f0d54b5b31b7facccc9693e1b81d6d55ead19eb6925
-  data.tar.gz: 35260093ddae69b83a85d4ec2d26511d209b8f5cd589f3208751135f6fcc64d9b44c914c1e00c18483000056528601c8b4396a3236234e956f16f8ee2fe2349c
+  metadata.gz: 36871634fa0359b6620cc25fa6da48ee201a3173ce147125345ab5767f5c1c36f2377ec2c9fe24cb5afb2e5e1e708606ed8316b9bfdf95963a52988b17fe0ba5
+  data.tar.gz: e5b62dfce3382efcd59c978def84f1ab5310ebebe5d376ce15348f0cabb2a6a4e2517152029b5f206fd718a45f032ae206c53bf8906829890e1b1f35f7f7dfde

data/lib/logstash/inputs/file.rb

@@ -147,7 +147,10 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
 
   public
   def teardown
-    @tail.sincedb_write
-    @tail.quit
+    if @tail
+      @tail.sincedb_write
+      @tail.quit
+      @tail = nil
+    end
   end # def teardown
 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         = '0.1.6'
+  s.version         = '0.1.7'
   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"

data/spec/inputs/file_spec.rb

@@ -8,11 +8,11 @@ describe "inputs/file" do
 
   delimiter = (LogStash::Environment.windows? ? "\r\n" : "\n")
 
-  describe "starts at the end of an existing file" do
+  it "should starts at the end of an existing file" do
     tmpfile_path = Stud::Temporary.pathname
     sincedb_path = Stud::Temporary.pathname
 
-    config <<-CONFIG
+    conf = <<-CONFIG
       input {
         file {
           type => "blah"
@@ -23,25 +23,23 @@ describe "inputs/file" do
       }
     CONFIG
 
-    input do |pipeline, queue|
-      File.open(tmpfile_path, "w") do |fd|
-        fd.puts("ignore me 1")
-        fd.puts("ignore me 2")
-      end
+    File.open(tmpfile_path, "w") do |fd|
+      fd.puts("ignore me 1")
+      fd.puts("ignore me 2")
+    end
 
-      Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
+    events = input(conf) do |pipeline, queue|
 
-      # at this point even if pipeline.ready? == true the plugins
+      # at this point the plugins
       # threads might still be initializing so we cannot know when the
       # file plugin will have seen the original file, it could see it
       # after the first(s) hello world appends below, hence the
       # retry logic.
 
-      retries = 0
-      loop do
-        insist { retries } < 20 # 2 secs should be plenty?
+      events = []
 
+      retries = 0
+      while retries < 20
         File.open(tmpfile_path, "a") do |fd|
           fd.puts("hello")
           fd.puts("world")
@@ -49,22 +47,25 @@ describe "inputs/file" do
 
         if queue.size >= 2
           events = 2.times.collect { queue.pop }
-          insist { events[0]["message"] } == "hello"
-          insist { events[1]["message"] } == "world"
           break
         end
 
         sleep(0.1)
         retries += 1
       end
+
+      events
     end
+
+    insist { events[0]["message"] } == "hello"
+    insist { events[1]["message"] } == "world"
   end
 
-  describe "can start at the beginning of an existing file" do
+  it "should start at the beginning of an existing file" do
     tmpfile_path = Stud::Temporary.pathname
     sincedb_path = Stud::Temporary.pathname
 
-    config <<-CONFIG
+    conf = <<-CONFIG
       input {
         file {
           type => "blah"
@@ -76,64 +77,59 @@ describe "inputs/file" do
       }
     CONFIG
 
-    input do |pipeline, queue|
-      File.open(tmpfile_path, "a") do |fd|
-        fd.puts("hello")
-        fd.puts("world")
-      end
-
-      Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
+    File.open(tmpfile_path, "a") do |fd|
+      fd.puts("hello")
+      fd.puts("world")
+    end
 
-      events = 2.times.collect { queue.pop }
-      insist { events[0]["message"] } == "hello"
-      insist { events[1]["message"] } == "world"
+    events = input(conf) do |pipeline, queue|
+      2.times.collect { queue.pop }
     end
+
+    insist { events[0]["message"] } == "hello"
+    insist { events[1]["message"] } == "world"
   end
 
-  describe "restarts at the sincedb value" do
+  it "should restarts at the sincedb value" do
     tmpfile_path = Stud::Temporary.pathname
     sincedb_path = Stud::Temporary.pathname
 
-    config <<-CONFIG
+    conf = <<-CONFIG
       input {
         file {
           type => "blah"
           path => "#{tmpfile_path}"
-	  start_position => "beginning"
+          start_position => "beginning"
           sincedb_path => "#{sincedb_path}"
           delimiter => "#{delimiter}"
         }
       }
     CONFIG
 
-    input do |pipeline, queue|
-      File.open(tmpfile_path, "w") do |fd|
-        fd.puts("hello")
-        fd.puts("world")
-      end
-
-      t = Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
-
-      events = 2.times.collect { queue.pop }
-      pipeline.shutdown
-      t.join
+    File.open(tmpfile_path, "w") do |fd|
+      fd.puts("hello3")
+      fd.puts("world3")
+    end
 
-      File.open(tmpfile_path, "a") do |fd|
-        fd.puts("foo")
-        fd.puts("bar")
-        fd.puts("baz")
-      end
+    events = input(conf) do |pipeline, queue|
+      2.times.collect { queue.pop }
+    end
 
-      Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
+    insist { events[0]["message"] } == "hello3"
+    insist { events[1]["message"] } == "world3"
 
-      events = 3.times.collect { queue.pop }
+    File.open(tmpfile_path, "a") do |fd|
+      fd.puts("foo")
+      fd.puts("bar")
+      fd.puts("baz")
+    end
 
-      insist { events[0]["message"] } == "foo"
-      insist { events[1]["message"] } == "bar"
-      insist { events[2]["message"] } == "baz"
+    events = input(conf) do |pipeline, queue|
+      3.times.collect { queue.pop }
     end
+
+    insist { events[0]["message"] } == "foo"
+    insist { events[1]["message"] } == "bar"
+    insist { events[2]["message"] } == "baz"
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,76 +28,78 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: addressable
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: addressable
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: filewatch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.6.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.1
-  name: filewatch
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
+        version: 0.0.19
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.19
-  name: stud
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.19
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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
 email: info@elasticsearch.com
 executables: []
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Stream events from files.