fluent-logger 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfed8c8167db552fe22b3b030b62041a5b523636
-  data.tar.gz: fdca6f7fcb62bb64364ae76af2a05bb287756ba2
+  metadata.gz: cb70f375d56167d4fa69310f24457f9697947fa9
+  data.tar.gz: 25ceec5e3dd80f84368cb28bc0f092d7dbd0766f
 SHA512:
-  metadata.gz: dae9cd5b7df431025125450fa88e53700d6a6b2b16d78ff327fb3e5f5ea4599023cec6afeae588251ba2e88a5e7d31cb6746466f9882fa855d68d0960be2026a
-  data.tar.gz: 0e3b5eb2f7a88a20295779c63a556201eb3d2c1098488f92a6dcc9ee93b5630f0d9770803ffc5c99d7370105ed244b50e49e0ed8c21001b493b9a331d858fb4e
+  metadata.gz: 571ef4468e47a4917e6525719594baa7f478f1a2d4b676b5d669a04f9b344bf86cc3edee7d4da1b21d9e2cdd357c4bd829ce03616761efa62ab322e2e52ef054
+  data.tar.gz: 803ed86c13a44b1b823b2d70ed0d2e60eae9c2e388a9d414751b8301ac6603a218254cad5ebc1c49d4febe410b5c6378d5a18797ca6a8f74bfdd0db502b5870b

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.6.3 - 2017/03/29
+
+  * Add pending_bytesize method
+
 Release 0.6.2 - 2017/01/17
 
   * Add unix domain socket support for `in_unix`

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/fluent/logger/fluent_logger.rb

@@ -135,6 +135,14 @@ module Fluent
         @socket_path ? "#{@socket_path}" : "#{@host}:#{@port}"
       end
 
+      def pending_bytesize
+        if @pending
+          @pending.bytesize
+        else
+          0
+        end
+      end
+
       private
 
       def to_msgpack(msg)
@@ -170,7 +178,7 @@ module Fluent
           end
 
           # suppress reconnection burst
-          if !@connect_error_history.empty? && @pending.bytesize <= @limit
+          if !@connect_error_history.empty? && pending_bytesize <= @limit
             if Time.now.to_i - @connect_error_history.last < suppress_sec
               return false
             end
@@ -182,7 +190,7 @@ module Fluent
             true
           rescue => e
             set_last_error(e)
-            if @pending.bytesize > @limit
+            if pending_bytesize > @limit
               @logger.error("FluentLogger: Can't send logs to #{connection_string}: #{$!}")
               call_buffer_overflow_handler(@pending)
               @pending = nil

data/lib/fluent/logger/version.rb

@@ -1,7 +1,7 @@
 module Fluent
 module Logger
 
-VERSION = '0.6.2'
+VERSION = '0.6.3'
 
 end
 end

data/spec/fluent_logger_spec.rb

@@ -58,9 +58,11 @@ describe Fluent::Logger::FluentLogger do
 
     context('post') do
       it ('success') {
+        expect(logger.pending_bytesize).to eq 0
         expect(logger.post('tag', {'a' => 'b'})).to be true
         fluentd.wait_transfer
         expect(fluentd.queue.last).to eq ['logger-test.tag', {'a' => 'b'}]
+        expect(logger.pending_bytesize).to eq 0
       }
 
       it ('close after post') {
@@ -72,6 +74,7 @@ describe Fluent::Logger::FluentLogger do
         expect(logger).to be_connect
         fluentd.wait_transfer
         expect(fluentd.queue.last).to eq ['logger-test.tag', {'b' => 'c'}]
+        expect(logger.pending_bytesize).to eq 0
       }
 
       it ('large data') {
@@ -150,9 +153,11 @@ describe Fluent::Logger::FluentLogger do
   context "not running fluentd" do
     context('fluent logger interface') do
       it ('post & close') {
+        expect(logger.pending_bytesize).to eq 0
         expect(logger.post('tag', {'a' => 'b'})).to be false
         fluentd.wait_transfer  # even if wait
         expect(fluentd.queue.last).to be_nil
+        expect(logger.pending_bytesize).to be > 0
         logger.close
         logger_io.rewind
         log = logger_io.read
@@ -204,11 +209,13 @@ describe Fluent::Logger::FluentLogger do
       let(:buffer_overflow_handler) { Proc.new { |messages| handler.flush(messages) } }
 
       it ('post limit over') do
+        expect(logger.pending_bytesize).to eq 0
         logger.limit = 100
         event_1 = {'a' => 'b'}
         logger.post('tag', event_1)
         fluentd.wait_transfer  # even if wait
         expect(fluentd.queue.last).to be(nil)
+        expect(logger.pending_bytesize).to be > 0
 
         logger_io.rewind
         expect(logger_io.read).not_to match(/Can't send logs to/)
@@ -216,6 +223,7 @@ describe Fluent::Logger::FluentLogger do
         event_2 = {'a' => ('c' * 1000)}
         logger.post('tag', event_2)
         logger_io.rewind
+        expect(logger.pending_bytesize).to eq 0
         expect(logger_io.read).to match(/Can't send logs to/)
 
         buffer = handler.buffer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack