logstash-input-lumberjack 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c95ed8c335834c6e16f56a92efa111ed21cf306
-  data.tar.gz: d82b929b991d94d8d50ac0e1100515acbd589670
+  metadata.gz: 12038c6ea1977ded3c29e696b911c450aef2637a
+  data.tar.gz: 155669c9a27b5ce28a72c44dc56cb4ad5d23fc3f
 SHA512:
-  metadata.gz: 247305962c11c14a6c48ea8bc024cb77a1c0a20f30e9089f913f54028f921eecd1222b4c0dc98f403c66286882b25769efbd58858e47cee46c5d29b178f31f03
-  data.tar.gz: f77f1b128dde2933c6728915d7dbfb4b771b6ff33645e1c328e52ef5fb8b438f5c2be8b74fba913204dd9f8e3e18a41367e708a7513ea803c16a4cb713ea6d1e
+  metadata.gz: 3948d3bac4c844e4cc45a05122d85dbb1647e9c8c644aed09c0dcbbc2b5e1a7b31d6180564aa0a5db5a9218e671d17e0b28ba1857b39576be49d304ff352f587
+  data.tar.gz: ed7708a847723a48ca267811a4de238fd895ebfee0d1c3e550004de2e25b3ee0b710055646172b2f707f11bb2a7fe6eacdf39e343c173f3a9e1dd43c4479bea7

data/lib/logstash/inputs/lumberjack.rb

@@ -4,7 +4,7 @@ require "logstash/namespace"
 
 # Receive events using the lumberjack protocol.
 #
-# This is mainly to receive events shipped with lumberjack[http://github.com/jordansissel/lumberjack], 
+# This is mainly to receive events shipped with lumberjack[http://github.com/jordansissel/lumberjack],
 # now represented primarily via the
 # https://github.com/elasticsearch/logstash-forwarder[Logstash-forwarder].
 #
@@ -43,12 +43,35 @@ class LogStash::Inputs::Lumberjack < LogStash::Inputs::Base
 
   public
   def run(output_queue)
-    @lumberjack.run do |l|
-      @codec.decode(l.delete("line")) do |event|
-        decorate(event)
-        l.each { |k,v| event[k] = v; v.force_encoding(Encoding::UTF_8) }
-        output_queue << event
+    while true do
+      accept do |connection, codec|
+        invoke(connection, codec) do |_codec, line, fields|
+          _codec.decode(line) do |event|
+            decorate(event)
+            fields.each { |k,v| event[k] = v; v.force_encoding(Encoding::UTF_8) }
+            output_queue << event
+          end
+        end
       end
     end
+  rescue => e
+    @logger.error("Exception in lumberjack input", :exception => e)
+    shutdown(output_queue)
   end # def run
+
+  private
+  def accept(&block)
+    connection = @lumberjack.accept # Blocking call that creates a new connection
+    block.call(connection, @codec.clone)
+  end
+
+  private
+  def invoke(connection, codec, &block)
+    Thread.new(connection, codec) do |_connection, _codec|
+      _connection.run do |fields|
+        block.call(_codec, fields.delete("line"), fields)
+      end
+    end
+  end
+
 end # class LogStash::Inputs::Lumberjack

data/logstash-input-lumberjack.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-lumberjack'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Receive events using the lumberjack protocol."
   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"
@@ -26,5 +26,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'jls-lumberjack', ['>=0.0.20']
 
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'stud'
+  s.add_development_dependency 'logstash-codec-multiline'
+  
 end
 

data/spec/inputs/lumberjack_spec.rb

@@ -1 +1,57 @@
-require "logstash/devutils/rspec/spec_helper"
+# encoding: utf-8
+require "spec_helper"
+require "stud/temporary"
+require 'logstash/inputs/lumberjack'
+require "logstash/codecs/plain"
+require "logstash/codecs/multiline"
+
+describe LogStash::Inputs::Lumberjack do
+
+  let(:ssl_cert) { Stud::Temporary.pathname("ssl_certificate") }
+  let(:ssl_key)  { Stud::Temporary.pathname("ssl_key") }
+
+  let(:queue)  { Queue.new }
+  let(:config)   { { "port" => 0, "ssl_certificate" => ssl_cert, "ssl_key" => ssl_key, "type" => "example" } }
+
+
+  before do
+    system("openssl req -x509  -batch -nodes -newkey rsa:2048 -keyout #{ssl_key} -out #{ssl_cert} -subj /CN=localhost > /dev/null 2>&1")
+  end
+
+  context "#register" do
+
+    it "raise no exception" do
+      plugin = LogStash::Inputs::Lumberjack.new(config)
+      expect { plugin.register}.not_to raise_error
+    end
+  end
+
+  describe "#processing of events" do
+
+    context "#codecs" do
+
+      let(:config) do
+        { "port" => 6969, "ssl_certificate" => ssl_cert, "ssl_key" => ssl_key,
+          "type" => "example", "codec" => codec }
+      end
+
+      let(:codec) { LogStash::Codecs::Multiline.new("pattern" => '\n', "what" => "previous") }
+      subject!(:lumberjack) { LogStash::Inputs::Lumberjack.new(config) }
+      let(:connection) { double("connection") }
+      let(:lines) { {"line" => "one\ntwo\n  two.2\nthree\n"} }
+
+      before(:each) do
+        allow(connection).to receive(:run).and_yield(lines)
+        lumberjack.register
+      end
+
+      it "clone the codec per connection" do
+        expect_any_instance_of(Lumberjack::Server).to receive(:accept).and_return(connection)
+        expect(lumberjack.codec).to receive(:clone).once
+        expect(lumberjack).to receive(:invoke).and_throw(:msg)
+        lumberjack.run(queue)
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/codecs/plain"

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-lumberjack
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-02-27 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,48 +28,78 @@ 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: jls-lumberjack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.0.20
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.20
-  name: jls-lumberjack
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: stud
+  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-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-multiline
   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'
+  prerelease: false
+  type: :development
 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: []
@@ -87,6 +115,7 @@ files:
 - lib/logstash/inputs/lumberjack.rb
 - logstash-input-lumberjack.gemspec
 - spec/inputs/lumberjack_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -109,9 +138,10 @@ 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: Receive events using the lumberjack protocol.
 test_files:
 - spec/inputs/lumberjack_spec.rb
+- spec/spec_helper.rb