logstash-input-exec 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60673ae805d32c1465c6fd83fe114d29532026a35c774eba83ef0a45179ecdd4
-  data.tar.gz: aa602926b347d292cc274f50a9a30051c645670a2e2921acb492807ec8446acc
+  metadata.gz: 454a3fd142d85a04a0e93b3054d6f300d9dbbe7f02013485e2e58d12c5aba3d3
+  data.tar.gz: c2a32db4b81afc9429beee70d704b7b2cb737b08b924f813a5e91e5de4fd709d
 SHA512:
-  metadata.gz: ff843ab17a5ef5e78a53686574524a1ed2efcfae2ebe347888d62e1119b03bd6e1e187f060adef48e7a5e382b5437784e2830aa88478cd5e471937073fb176b8
-  data.tar.gz: b5a516f596d317264f981324e2f428fdaf9bf4daae6c7c388689315aec6c59f19678c9491558581b9ec91ef16c5014c964352fd3cf1456d59ce6f104b8d997be
+  metadata.gz: 983904e90f7ba90ecae393cdda1fa39abb093bc923ca82f63c70dc818b48edc36211926a6848a7c48a7547f17e0d96b7bb7a21d0f353768c064f5d2f17eab7b5
+  data.tar.gz: 3e7e26cde26f98fcbe1d3e0a752dec41729135c85d49720197d2a1d018c97898188bbe27fcd73290c0169d68d7263b8b6d270f6c95a8012d22a35dda47cf10b4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.2
+  - Fixed issue where certain log entries were incorrectly writing 'jdbc input' instead of 'exec input' [#21](https://github.com/logstash-plugins/logstash-input-exec/pull/21)
+
 ## 3.3.1
   - Docs: Set the default_codec doc attribute.
 

data/docs/index.asciidoc

@@ -74,7 +74,7 @@ Command to run. For example, `uptime`
 [id="plugins-{type}s-{plugin}-interval"]
 ===== `interval` 
 
-  * Value type is <<string,string>>
+  * Value type is <<number,number>>
   * There is no default value for this setting.
 
 Interval to run the command. Value is in seconds.
@@ -84,7 +84,7 @@ Either `interval` or `schedule` option must be defined.
 [id="plugins-{type}s-{plugin}-schedule"]
 ===== `schedule` 
 
-  * Value type is <<number,number>>
+  * Value type is <<string,string>>
   * There is no default value for this setting.
 
 Schedule of when to periodically run command.
@@ -108,4 +108,4 @@ Either `interval` or `schedule` option must be defined.
 [id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]
 
-:default_codec!:
+:default_codec!:

data/lib/logstash/inputs/exec.rb

@@ -36,7 +36,7 @@ class LogStash::Inputs::Exec < LogStash::Inputs::Base
     @io       = nil
     
     if (@interval.nil? && @schedule.nil?) || (@interval && @schedule)
-      raise LogStash::ConfigurationError, "jdbc input: either 'interval' or 'schedule' option must be defined."
+      raise LogStash::ConfigurationError, "exec input: either 'interval' or 'schedule' option must be defined."
     end
   end # def register
 

data/logstash-input-exec.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-exec'
-  s.version         = '3.3.1'
+  s.version         = '3.3.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Captures the output of a shell command as an event"
   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/inputs/exec_spec.rb

@@ -6,24 +6,26 @@ require_relative "../spec_helper"
 describe LogStash::Inputs::Exec do
 
   context "when register" do
+    let(:input) { described_class.new("command" => "ls", "interval" => 0) }
     it "should not raise error if config is valid" do
-      input = LogStash::Plugin.lookup("input", "exec").new("command" => "ls", "interval" => 0)
       # register will try to load jars and raise if it cannot find jars or if org.apache.log4j.spi.LoggingEvent class is not present
       expect {input.register}.to_not raise_error
     end
-    it "should raise error if config is invalid" do
-      input = LogStash::Plugin.lookup("input", "exec").new("command" => "ls")
-      expect {input.register}.to raise_error
+    context "with an invalid config" do
+      let(:input) { described_class.new("command" => "ls") }
+      it "should raise error" do
+        expect {input.register}.to raise_error(LogStash::ConfigurationError)
+      end
     end
   end
 
   context "when operating normally" do
-    let(:input) { LogStash::Plugin.lookup("input", "exec").new("command" => "ls", "interval" => 0) }
+    let(:input) { described_class.new("command" => "ls", "interval" => 0) }
     let(:queue) { [] }
     let(:loggr) { double('loggr') }
 
     before :each do
-      expect(LogStash::Inputs::Exec).to receive(:logger).and_return(loggr).exactly(7).times
+      expect(described_class).to receive(:logger).and_return(loggr).exactly(7).times
       allow(loggr).to receive(:info)
       allow(loggr).to receive(:info?)
       allow(loggr).to receive(:warn)
@@ -43,7 +45,7 @@ describe LogStash::Inputs::Exec do
   end
 
   context "when a command runs normally" do
-    let(:input) { LogStash::Plugin.lookup("input", "exec").new("command" => "/bin/sh -c 'sleep 1; /bin/echo -n two; exit 3'", "interval" => 0) }
+    let(:input) { described_class.new("command" => "/bin/sh -c 'sleep 1; /bin/echo -n two; exit 3'", "interval" => 0) }
     let(:queue) { [] }
 
     before do
@@ -68,7 +70,7 @@ describe LogStash::Inputs::Exec do
   end
 
   context "when scheduling" do
-    let(:input) { LogStash::Plugin.lookup("input", "exec").new("command" => "ls", "schedule" => "* * * * * UTC") }
+    let(:input) { described_class.new("command" => "ls", "schedule" => "* * * * * UTC") }
     let(:queue) { [] }
 
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-exec
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Captures the output of a shell command as an event