logstash-input-pipe 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186eac42ddcc84a5617b4230279f21b071271273
-  data.tar.gz: 474b8c3e2d843ac67ad1f019e3a277f4fe23f1f3
+  metadata.gz: fd004399743c5e103d23b513388b0659e743e758
+  data.tar.gz: 5df2f4312e0e1ed558833063e796eb0ed18aa0e8
 SHA512:
-  metadata.gz: 08aa2401c11aafcfa44ca8f699bd3bd42c465e8472556de08caf37651811bbc7b88c0f272aa5690e309bfb23f285b382a6cad46f60ec3a5b57eadbfaa1835e7b
-  data.tar.gz: c820b097bc25d67177e6164c84185deb621e042b726e0fd89df2f5cd58da27cb586726121b9a68eb2583051af823f5d867f8e5a425228d7b25f193a80ea8a82b
+  metadata.gz: 97b65f55794d98ddf78467dde8ea3de77960330ed2d688a0e7b54d2c56e1b1d278595bd5483b4533cd42f817e8f5634d1772c27c92000de2419c20387742a33d
+  data.tar.gz: d4c628c49a7992007e196e049f6ee9bdb3e70123289c5dd08ba47876d8c53c9ab9acb78ac07d9c16610381cf3cdbcab9406893c3c6829223e01e1a287bc45356

data/lib/logstash/inputs/pipe.rb

@@ -26,6 +26,12 @@ class LogStash::Inputs::Pipe < LogStash::Inputs::Base
   #    command => "echo hello world"
   config :command, :validate => :string, :required => true
 
+  def initialize(params)
+    super
+    @shutdown_requested = false
+    @pipe = nil
+  end # def initialize
+
   public
   def register
     @logger.info("Registering pipe input", :command => @command)
@@ -33,14 +39,13 @@ class LogStash::Inputs::Pipe < LogStash::Inputs::Base
 
   public
   def run(queue)
-    loop do
+    while !@shutdown_requested
       begin
-        @pipe = IO.popen(@command, mode="r")
+        @pipe = IO.popen(@command, mode = "r")
         hostname = Socket.gethostname
 
         @pipe.each do |line|
           line = line.chomp
-          source = "pipe://#{hostname}/#{@command}"
           @logger.debug? && @logger.debug("Received line", :command => @command, :line => line)
           @codec.decode(line) do |event|
             event["host"] = hostname
@@ -49,6 +54,8 @@ class LogStash::Inputs::Pipe < LogStash::Inputs::Base
             queue << event
           end
         end
+        @pipe.close
+        @pipe = nil
       rescue LogStash::ShutdownSignal => e
         break
       rescue Exception => e
@@ -59,4 +66,15 @@ class LogStash::Inputs::Pipe < LogStash::Inputs::Base
       sleep(10)
     end
   end # def run
+
+  def teardown
+    @shutdown_requested = true
+    if @pipe
+      Process.kill("KILL", @pipe.pid) rescue nil
+      @pipe.close rescue nil
+      @pipe = nil
+    end
+    finished
+  end
+
 end # class LogStash::Inputs::Pipe

data/logstash-input-pipe.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-pipe'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream events from a long running command pipe"
   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/pipe_spec.rb

@@ -4,56 +4,52 @@ require "tempfile"
 
 describe "inputs/pipe", :unix => true do
 
-  describe "echo" do
-    event_count = 1
-    tmp_file = Tempfile.new('logstash-spec-input-pipe')
-
-    config <<-CONFIG
-    input {
-      pipe {
-        command => "echo ☹"
+  # rince and repeat a few times to stress the shutdown sequence
+  5.times.each do
+    it "should pipe from echo" do
+      conf = <<-CONFIG
+      input {
+        pipe {
+          command => "echo ☹"
+        }
       }
-    }
-    CONFIG
+      CONFIG
 
-    input do |pipeline, queue|
-      Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
-
-      events = event_count.times.collect { queue.pop }
-      event_count.times do |i|
-        insist { events[i]["message"] } == "☹"
+      event = input(conf) do |pipeline, queue|
+        queue.pop
       end
-    end # input
-  end
 
-  describe "tail -f" do
-    event_count = 10
-    tmp_file = Tempfile.new('logstash-spec-input-pipe')
+      insist { event["message"] } == "☹"
+    end
+  end
 
-    config <<-CONFIG
-    input {
-      pipe {
-        command => "tail -f #{tmp_file.path}"
+  # rince and repeat a few times to stress the shutdown sequence
+  5.times.each do
+    it "should pipe from tail -f" do
+      event_count = 10
+      tmp_file = Tempfile.new('logstash-spec-input-pipe')
+
+      conf = <<-CONFIG
+      input {
+        pipe {
+          command => "tail -n +0 -f #{tmp_file.path}"
+        }
       }
-    }
-    CONFIG
-
-    input do |pipeline, queue|
-      Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
-
-      File.open(tmp_file, "a") do |fd|
-        event_count.times do |i|
-          # unicode smiley for testing unicode support!
-          fd.puts("#{i} ☹")
+      CONFIG
+
+      events = input(conf) do |pipeline, queue|
+        File.open(tmp_file, "a") do |fd|
+          event_count.times do |i|
+            # unicode smiley for testing unicode support!
+            fd.puts("#{i} ☹")
+          end
         end
+        event_count.times.map { queue.pop }
       end
-      events = event_count.times.collect { queue.pop }
+
       event_count.times do |i|
         insist { events[i]["message"] } == "#{i} ☹"
       end
-    end # input
+    end
   end
-
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-pipe
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 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,34 +28,36 @@ 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: logstash-devutils
   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: 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: []
@@ -95,7 +95,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 a long running command pipe