logstash-input-log4j 2.0.2-java → 2.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb395d5fc55f0c24ea2ea791a30428cfa9d297e
-  data.tar.gz: 620c01374174a2210ea969620b1627c6ef79fce6
+  metadata.gz: 945e2806f2a50edaf4c8576103998d3bc2ba8372
+  data.tar.gz: 565249091a9afc20cc6a73dd13777b007e545bbc
 SHA512:
-  metadata.gz: f4411ed31f75ba6c223a11c5f9f625cec3232e74221ba46f2025b2e3eb0dc51ea3a83b17ef4d331249182711e40c71c44a64e70aa1c9e41a3ddcbbbb51a84ae5
-  data.tar.gz: efe22e5b460a4a5ccb8ea6d0416a6278496a3277a52339a8692fd451114979da4a6c5ad87cd5b8421ee6316f7bf289eddc49b6b159a9370dffa43a9579f072db
+  metadata.gz: 66fc5a0768a5c0bae0bf9c6253bc41c22578a6ed00f441f68c8376d79201fca31df51eb01e3c893af14dab8d170a3f139ea88ee83ff753a19aa11f527fd81888
+  data.tar.gz: 786307fcd028e1f68e7fc88cb3045ac1afaa2a8c87e5ae77874615c6d337e60129bd30b0a1f5581cc1533621685edcf5000b21fbbcde0af87037d319527359ce

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.0.3
+ - Refactor code to improve test reliability
 ## 2.0.2
  - Fix tests with `Thread.abort_on_exception` turn on
 ## 2.0.0

data/lib/logstash/inputs/log4j.rb

@@ -153,7 +153,7 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
     if server?
       while !stop?
         Thread.start(@server_socket.accept) do |s|
-          s.instance_eval { class << self; include ::LogStash::Util::SocketPeer end }
+          add_socket_mixin(s)
           @logger.debug? && @logger.debug("Accepted connection", :client => s.peer,
                         :server => "#{@host}:#{@port}")
           handle_socket(s, output_queue)
@@ -161,12 +161,21 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
       end # loop
     else
       while !stop?
-        client_socket = TCPSocket.new(@host, @port)
-        client_socket.instance_eval { class << self; include ::LogStash::Util::SocketPeer end }
+        client_socket = build_client_socket
         @logger.debug? && @logger.debug("Opened connection", :client => "#{client_socket.peer}")
         handle_socket(client_socket, output_queue)
       end # loop
     end
   rescue IOError
   end # def run
+
+  def build_client_socket
+    s = TCPSocket.new(@host, @port)
+    add_socket_mixin(s)
+    s
+  end
+
+  def add_socket_mixin(socket)
+    socket.instance_eval { class << self; include ::LogStash::Util::SocketPeer end }
+  end
 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.2'
+  s.version         = '2.0.3'
   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

@@ -27,7 +27,7 @@ describe LogStash::Inputs::Log4j 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)
+        allow(subject).to receive(:build_client_socket).and_return(socket)
         expect(subject).to receive(:socket_to_inputstream).with(socket).and_return(ois)
         expect(subject).to receive(:create_event).and_return(LogStash::Event.new).at_least(:once)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-log4j
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement