refactor some operations to enable better testing

Fixes #23

Author: guyboertje

lib/logstash/inputs/log4j.rb

@@ -153,20 +153,29 @@ def run(output_queue)
  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)
  end # Thread.start
  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

spec/inputs/log4j_spec.rb

@@ -27,7 +27,7 @@
  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