logstash-input-log4j 2.0.1-java → 2.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e70e42dbe6c00e0995115979ec8e20aedbf9bc65
-  data.tar.gz: 203dbff9c9215881e8f3ca9debbca3e864d70ad5
+  metadata.gz: dcb395d5fc55f0c24ea2ea791a30428cfa9d297e
+  data.tar.gz: 620c01374174a2210ea969620b1627c6ef79fce6
 SHA512:
-  metadata.gz: b073ac4434227c21804c87fa9024d1d47ed5cd2efb0090316268466d38e80b53acaad1ec7146f2bec5859b987bf412987f0e095f5ebb2e55f65965650ead0c83
-  data.tar.gz: 344fe6ea2cb2c37763950cfc54d9bf3bcf996ffcce9226878af5845b411c2169ea548248b82ca533ecbac54fec66e4ce9eee767a062add95048ef7d376077147
+  metadata.gz: f4411ed31f75ba6c223a11c5f9f625cec3232e74221ba46f2025b2e3eb0dc51ea3a83b17ef4d331249182711e40c71c44a64e70aa1c9e41a3ddcbbbb51a84ae5
+  data.tar.gz: efe22e5b460a4a5ccb8ea6d0416a6278496a3277a52339a8692fd451114979da4a6c5ad87cd5b8421ee6316f7bf289eddc49b6b159a9370dffa43a9579f072db

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.0.2
+ - Fix tests with `Thread.abort_on_exception` turn on
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895

data/lib/logstash/inputs/log4j.rb

@@ -142,7 +142,10 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
   # method used to stop the plugin and unblock
   # pending blocking operatings like sockets and others.
   def stop
-    @server_socket.close if @server_socket && !@server_socket.closed?
+    begin
+      @server_socket.close if @server_socket && !@server_socket.closed?
+    rescue IOError
+    end
   end
 
   public
@@ -164,5 +167,6 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
         handle_socket(client_socket, output_queue)
       end # loop
     end
+  rescue IOError
   end # def run
 end # class LogStash::Inputs::Log4j

data/logstash-input-log4j.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-log4j'
-  s.version         = '2.0.1'
+  s.version         = '2.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read events over a TCP socket from a Log4j SocketAppender"
   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/log4j_spec.rb

@@ -8,22 +8,24 @@ describe LogStash::Inputs::Log4j do
   it "should register" do
     input = LogStash::Plugin.lookup("input", "log4j").new("mode" => "client")
 
+
     # 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
 
-  context "when interrupting the plugin" do
-
-    it_behaves_like "an interruptible input plugin" do
-      let(:config) { { "mode" =>  "server" } }
-    end
+  context "when interrupting the plugin in server mode" do
+    let(:config) { { "mode" =>  "server" } }
+    it_behaves_like "an interruptible input plugin"
+  end
 
+  context "when interrupting the plugin in client mode" do
     it_behaves_like "an interruptible input plugin" do
       let(:config) { { "mode" =>  "client" } }
       let(:socket) { double("socket") }
       let(:ois)    { double("ois") }
       before(:each) do
         allow(socket).to receive(:peer).and_return("localhost")
+        allow(socket).to receive(:close).and_return(true)
         allow(ois).to receive(:readObject).and_return({})
         allow(TCPSocket).to receive(:new).and_return(socket)
         expect(subject).to receive(:socket_to_inputstream).with(socket).and_return(ois)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-log4j
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: java
 authors:
 - Elastic