fluent-logger 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00161d7e89f54b0c1627bb5b0ce36a7689405b84da319db5c4052e585c09f6a7
-  data.tar.gz: fc7229efbe7fb40412fe22080aa974156f49f7d5e4257c0071d82eb7359cca72
+  metadata.gz: 460c4365ba58c7558db145e551b806ee8b2afb764454bfbba35e6f6290093317
+  data.tar.gz: 5166f31570a03e934c217464a2d16706f82bd650581f43d83ee87c53e0952da8
 SHA512:
-  metadata.gz: 1066053b93cf4173b29e063659d7f80bb42b77a116b85b2a18f3d43cf19c54538359336b4b120d0ff43b65cc58110ae8a3357a52f417a0379ea09c306e27b808
-  data.tar.gz: 8c7839a41b615ccf34ebcd656c1719ba99245c39abe9981969b8cb7d1a9cf57ad972dfb8276ebffe4c8c132d95d2a1dfc1db5b354bfc720b4a7c569722688a33
+  metadata.gz: 443b59cb242dc22e0d7ec6e711aefc2274452b5ea19d04af73db8250683f27da15b731af24b137213d91ea1f9c91873e7c5b85302c461c3f312b5d19e4bed2b7
+  data.tar.gz: 3e1d99bb86d51e2e589621e73ad763de5928e19aa1a15d470fa7adc616a749674df69356b8bd431d07804a8f5925bcb8742c98a560e99f6ff35abf2f423c439e

data/.github/workflows/linux.yml

@@ -0,0 +1,30 @@
+name: linux
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+        os:
+          - ubuntu-latest
+    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: unit testing
+      env:
+        CI: true
+      run: |
+        gem install bundler rake
+        bundle install --jobs 4 --retry 3
+        bundle exec rake spec

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.9.1 - 2023/12/20
+
+  * Fix invalid message polluting subsequent message
+
 Release 0.9.0 - 2020/09/04
 
   * FluentLogger supports TLS

data/README.md

@@ -1,6 +1,6 @@
 # Fluent logger
 
-[![Build Status](https://travis-ci.org/fluent/fluent-logger-ruby.svg?branch=master)](https://travis-ci.org/fluent/fluent-logger-ruby)
+[![Build Status](https://github.com/fluent/fluent-logger-ruby/actions/workflows/linux.yml/badge.svg?branch=master)](https://github.com/fluent/fluent-logger-ruby/actions/workflows/linux.yml)
 
 A structured event logger
 
@@ -101,7 +101,7 @@ log = Fluent::Logger::FluentLogger.new(nil, :host => 'localhost', :port => 24224
 ```
 <source>
   @type forward
-  <transport tcp>
+  <transport tls>
     version TLS1_2
     ca_path /path/to/cacert.pem
     cert_path /path/to/server-cert.pem
@@ -245,7 +245,7 @@ Fluent::Logger::NullLogger.open
 
 To send events with nanosecond-precision time (Fluent 0.14 and up), specify `nanosecond_precision` to `FluentLogger` constructor.
 
-```rb
+```ruby
 log = Fluent::Logger::FluentLogger.new(nil, :host => 'localhost', :port => 24224, :nanosecond_precision => true)
 # Use nanosecond time instead
 log.post("myapp.access", {"agent" => "foo"})
@@ -259,7 +259,7 @@ You can inject your own custom proc to handle buffer overflow in the event of co
 Your proc must accept a single argument, which will be the internal buffer of messages from the logger. A typical use-case for this would be writing to disk or possibly writing to Redis.
 
 ##### Example
-```
+```ruby
 class BufferOverflowHandler
   attr_accessor :buffer
 

data/fluent-logger.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-its', '>= 1.1.0'
   gem.add_development_dependency 'simplecov', '>= 0.5.4'
   gem.add_development_dependency 'timecop', '>= 0.3.0'
+  gem.add_development_dependency 'webrick'
 end

data/lib/fluent/logger/fluent_logger.rb

@@ -231,8 +231,9 @@ module Fluent
                   @packer.pack(msg).to_s
                 rescue NoMethodError
                   JSON.parse(JSON.generate(msg)).to_msgpack
+                ensure
+                  @packer.clear
                 end
-          @packer.clear
           res
         }
       end

data/lib/fluent/logger/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module Logger
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
   end
 end

data/spec/fluent_logger_spec.rb

@@ -205,6 +205,10 @@ describe Fluent::Logger::FluentLogger do
         expect(fluentd.queue.last).to be_nil
         logger_io.rewind
         logger_io.read =~ /FluentLogger: Can't convert to msgpack:/
+
+        logger.post('tag', { 'a' => 'b' })
+        fluentd.wait_transfer
+        expect(fluentd.queue.last).to eq ['logger-test.tag', { 'a' => 'b' }]
       }
 
       it ('should raise an error when second argument is non hash object') {
@@ -382,6 +386,16 @@ describe Fluent::Logger::FluentLogger do
 
     before(:each) do
       fluentd.startup(true)
+      # Make sure to wait TLS server since preparing it takes longer time than
+      # non-TLS so that it might be too early especially on CI environment
+      3.times do
+        begin
+          TCPSocket.open('localhost', fluentd.port) {}
+          break
+        rescue
+          fluentd.wait_transfer
+        end
+      end
     end
 
     after(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: fluent logger for ruby
 email: frsyuki@gmail.com
 executables:
@@ -107,9 +121,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/linux.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - AUTHORS
 - COPYING
 - ChangeLog
@@ -161,20 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: fluent logger for ruby
-test_files:
-- spec/console_logger_spec.rb
-- spec/fluent_logger_spec.rb
-- spec/level_fluent_logger_spec.rb
-- spec/logger_base_spec.rb
-- spec/logger_spec.rb
-- spec/null_logger_spec.rb
-- spec/plugin/out_test.rb
-- spec/spec_helper.rb
-- spec/support/dummy_fluentd.rb
-- spec/support/dummy_serverengine.rb
-- spec/support/timecop.rb
-- spec/test_logger_spec.rb
+test_files: []

data/.travis.yml

@@ -1,18 +0,0 @@
-rvm:
- - 2.4.10
- - 2.5
- - 2.6
- - 2.7
- - ruby-head
-
-gemfile:
- - Gemfile
-
-before_install: gem update bundler
-script: bundle exec rake spec
-
-sudo: false
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head