logstash-output-lumberjack 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94ffcc38f558649f2e489412d98459ba46bf279
-  data.tar.gz: 61f1263d52b98610ed31197789f49c8aeb84f1af
+  metadata.gz: 8c8044024e6b89b6491757db35d6d097113bbca0
+  data.tar.gz: bf90326647ded879e8c14c95ee61e216d54117e2
 SHA512:
-  metadata.gz: 1c9f7248e519bd11179e506ad21e445971ad5501487dbd9fc7a0dc78fd293f84ffa8b06402eb62099ae9ddcf053d7a3fa8ae2cf7a5a69b886fbf7b5640881d35
-  data.tar.gz: ab4e974e739de5efc97fd52a271f30a9fa9b5396d324640f4494b04da40139da070cfbe66a2547d69ce7687664ea2f0f5314be1616ab874bd7cd9c8646a30652
+  metadata.gz: 0c3d0155764e37a51baa59238c21d82d11ae2d60d04a92ddbef1c5b2efbfab53d8d5d1fa94680b75ce8b7e86bda5bd9c44a1c8e7aceb8cce4305748903755089
+  data.tar.gz: c864f21d58dfa375d50395f7e9386328053f558ef20f942ab1a7b86cfcdbb13db5c6e934741d2b76a7997fb3c4fa2493748495b958efbcd5c4d6a965f21bef03

data/lib/logstash/outputs/lumberjack.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "logstash/outputs/base"
+require "logstash/errors"
 require "stud/buffer"
 require "thread"
 
@@ -19,9 +20,9 @@ class LogStash::Outputs::Lumberjack < LogStash::Outputs::Base
 
   # window size
   config :window_size, :validate => :number, :deprecated => "Use `flush_size`", :require => false
-  
-  # To make efficient calls to the lumberjack output we are buffering events locally. 
-  # if the number of events exceed the number the declared `flush_size` we will 
+
+  # To make efficient calls to the lumberjack output we are buffering events locally.
+  # if the number of events exceed the number the declared `flush_size` we will
   # send them to the logstash server.
   config :flush_size, :validate => :number, :default => 1024
 
@@ -57,7 +58,6 @@ class LogStash::Outputs::Lumberjack < LogStash::Outputs::Base
 
   public
   def receive(event)
-    
     return if event == LogStash::SHUTDOWN
     @codec.encode(event)
   end # def receive
@@ -73,23 +73,27 @@ class LogStash::Outputs::Lumberjack < LogStash::Outputs::Base
       retry
     end # begin
   end
-  
-  private 
+
+  def close
+    buffer_flush(:force => true)
+  end
+
+  private
   def max_items
     @window_size || @flush_size
   end
 
   def connect
     require 'resolv'
-    @logger.info("Connecting to lumberjack server.", :addresses => @hosts, :port => @port, 
+    @logger.info("Connecting to lumberjack server.", :addresses => @hosts, :port => @port,
         :ssl_certificate => @ssl_certificate, :window_size => @window_size)
     begin
       ips = []
       @hosts.each { |host| ips += Resolv.getaddresses host }
-      @client = Lumberjack::Client.new(:addresses => ips.uniq, :port => @port, 
+      @client = Lumberjack::Client.new(:addresses => ips.uniq, :port => @port,
         :ssl_certificate => @ssl_certificate, :window_size => @window_size)
     rescue Exception => e
-      @logger.error("All hosts unavailable, sleeping", :hosts => ips.uniq, :e => e, 
+      @logger.error("All hosts unavailable, sleeping", :hosts => ips.uniq, :e => e,
         :backtrace => e.backtrace)
       sleep(10)
       retry

data/logstash-output-lumberjack.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-lumberjack'
-  s.version         = '2.0.1'
+  s.version         = '2.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Send 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"

data/spec/outputs/lumberjack_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "logstash/outputs/lumberjack"
+require "logstash/errors"
 require "logstash/event"
 require "logstash/devutils/rspec/spec_helper"
 require "lumberjack/server"
@@ -20,7 +21,6 @@ describe "Sending events" do
   let(:port) { Flores::Random.integer(1024..65535) }
   let(:host) { "127.0.0.1" }
   let(:queue) { [] }
-
   let(:client_options) {
     {
       "hosts" => [host],
@@ -29,19 +29,32 @@ describe "Sending events" do
       "flush_size" => batch_size
     }
   }
+
   let(:output) { LogStash::Outputs::Lumberjack.new(client_options) }
 
-  context "when the server closes the connection" do
-    before do
-      File.open(certificate_file_crt, "a") { |f| f.write(certificate.first) }
-      File.open(certificate_file_key, "a") { |f| f.write(certificate.last) }
+  let(:server) { 
+    Lumberjack::Server.new(:port => port,
+                           :address => host,
+                           :ssl_certificate => certificate_file_crt,
+                           :ssl_key => certificate_file_key)
+
+  }
 
-      server = Lumberjack::Server.new(:port => port,
-                                      :address => host,
-                                      :ssl_certificate => certificate_file_crt,
-                                      :ssl_key => certificate_file_key)
 
+  before do
+    File.open(certificate_file_crt, "a") { |f| f.write(certificate.first) }
+    File.open(certificate_file_key, "a") { |f| f.write(certificate.last) }
+  end
+
+  after do
+    FileUtils.rm_rf(certificate_file_crt)
+    FileUtils.rm_rf(certificate_file_key)
+  end
+
+  context "when the server closes the connection" do
+    before do
       crashed_count = 0
+
       @server = Thread.new do
         begin
           server.run do |data|
@@ -59,11 +72,6 @@ describe "Sending events" do
       output.register
     end
 
-    after do
-      FileUtils.rm_rf(certificate_file_crt)
-      FileUtils.rm_rf(certificate_file_key)
-    end
-
     it "reconnects and resend the payload" do
       # We guarantee at least once, 
       # duplicates can happen in this scenario.
@@ -73,4 +81,26 @@ describe "Sending events" do
       expect(queue.map { |e| e["line"] }).to include(*batch_payload.map(&:to_s))
     end
   end
+
+  context "when shutting down" do
+    let(:queue) { [] }
+    let(:event) { LogStash::Event.new("line" => "Hello") }
+    let(:number_of_events) { 50 }
+
+    before do 
+      @server = Thread.new do
+        server.run do |data|
+          queue << data
+        end
+      end
+
+      output.register
+    end
+
+    it "flushes the events in the buffer" do
+      number_of_events.times { output.receive(event) }
+      output.close
+      expect(queue.size).to eq(number_of_events)
+    end
+  end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-lumberjack
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-13 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: 3.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,105 +28,107 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: jls-lumberjack
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.24
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.24
-  name: jls-lumberjack
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.24
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: stud
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   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-output-lumberjack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-output-lumberjack
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: flores
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: flores
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/logstash/outputs/lumberjack.rb
+- spec/outputs/lumberjack_spec.rb
+- logstash-output-lumberjack.gemspec
 - CHANGELOG.md
+- README.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- lib/logstash/outputs/lumberjack.rb
-- logstash-output-lumberjack.gemspec
-- spec/outputs/lumberjack_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Send events using the lumberjack protocol