fluent-logger 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460c4365ba58c7558db145e551b806ee8b2afb764454bfbba35e6f6290093317
-  data.tar.gz: 5166f31570a03e934c217464a2d16706f82bd650581f43d83ee87c53e0952da8
+  metadata.gz: 35434f35801a28fb88c9802cfd213caa4a9a052f087241768f676b0f7c67958a
+  data.tar.gz: cf2b26bbf41d008c9c3e462a0dcd5e2c23cfbdbc9c08227d31454d4b171abb83
 SHA512:
-  metadata.gz: 443b59cb242dc22e0d7ec6e711aefc2274452b5ea19d04af73db8250683f27da15b731af24b137213d91ea1f9c91873e7c5b85302c461c3f312b5d19e4bed2b7
-  data.tar.gz: 3e1d99bb86d51e2e589621e73ad763de5928e19aa1a15d470fa7adc616a749674df69356b8bd431d07804a8f5925bcb8742c98a560e99f6ff35abf2f423c439e
+  metadata.gz: 899bccf2efee5b4c230155e1ef6beb9fa4b1f06b843fb9abd5f87630246f1f112b75200fa0d431de3aeba5e9dbf13e55a97fa3b57945112530cdda57288d1cc7
+  data.tar.gz: 8bebd7215231cef3379b5a6e9ccdc72407b0198874d44860033056cc97600dce811a5929cf13533bd42e1954c24fe01b9de5c27037a57a6b4354b6adbe41e393

data/.github/workflows/linux.yml

@@ -9,22 +9,20 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.7'
-          - '3.0'
-          - '3.1'
           - '3.2'
+          - '3.3'
+          - '3.4'
         os:
           - ubuntu-latest
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - 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,8 @@
+Release 0.10.0 - 2025/09/04
+
+  * Add timeout option (#104)
+  * gemspec: add logger gem as runtime dependency
+
 Release 0.9.1 - 2023/12/20
 
   * Fix invalid message polluting subsequent message

data/Gemfile

@@ -1,11 +1,12 @@
-
 source 'https://rubygems.org/'
 
-gem "fluentd", :github => 'fluent/fluentd'
-
 gemspec
 
-gem "simplecov", :require => false
+gem "rake", ">= 0.9.2"
+gem "rspec", ">= 3.0.0"
+gem "rspec-its", ">= 1.1.0"
+gem "timecop", ">= 0.3.0"
+gem "fluentd"
+gem "test-unit"
+gem "simplecov", ">= 0.5.4", require: false
 gem "simplecov-vim"
-
-gem 'test-unit'

data/README.md

@@ -148,6 +148,10 @@ Use nonblocking write(`IO#write_nonblock`) instead of normal write(`IO#write`).
 
 If `false`, `Logger#post` raises an error when nonblocking write gets `EAGAIN` (i.e. `use_nonblock` must be `true`, otherwise this will have no effect).  Default: `true`
 
+#### timeout (Integer)
+
+Specify a timeout in seconds for connecting. Default: `0` (Disabled)
+
 #### buffer_overflow_handler (Proc)
 
 Pass callback for handling buffer overflow with pending data. See "Buffer overflow" section.

data/fluent-logger.gemspec

@@ -22,10 +22,6 @@ Gem::Specification.new do |gem|
   gem.license       = "Apache-2.0"
 
   gem.add_dependency "msgpack", ">= 1.0.0", "< 2"
-  gem.add_development_dependency 'rake', '>= 0.9.2'
-  gem.add_development_dependency 'rspec', '>= 3.0.0'
-  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'
+  # logger gem that isn't default gems as of Ruby 3.5
+  gem.add_dependency "logger", "~> 1.6"
 end

data/lib/fluent/logger/fluent_logger.rb

@@ -22,6 +22,7 @@ require 'openssl'
 require 'monitor'
 require 'logger'
 require 'json'
+require 'timeout'
 
 module Fluent
   module Logger
@@ -115,6 +116,8 @@ module Fluent
         @wait_writeable = true
         @wait_writeable = options[:wait_writeable] if options.key?(:wait_writeable)
 
+        @timeout = options[:timeout] || 0
+
         @last_error = {}
 
         begin
@@ -170,7 +173,9 @@ module Fluent
         if @socket_path
           @con = UNIXSocket.new(@socket_path)
         else
-          @con = TCPSocket.new(@host, @port)
+          @con = Timeout.timeout(@timeout) do
+            TCPSocket.new(@host, @port)
+          end
           if @tls_options
             context = OpenSSL::SSL::SSLContext.new
             if @tls_options[:insecure]

data/lib/fluent/logger/version.rb

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

data/spec/fluent_logger_spec.rb

@@ -6,6 +6,7 @@ require 'support/dummy_fluentd'
 require 'logger'
 require 'stringio'
 require 'fluent/logger/fluent_logger/cui'
+require 'timeout'
 
 describe Fluent::Logger::FluentLogger do
   let(:fluentd) {
@@ -434,4 +435,13 @@ describe Fluent::Logger::FluentLogger do
       }
     end
   end
+
+  it ('support timeout') {
+    Timeout::timeout(5) do
+      # Use invalid IP address to make sure that the connection will timeout.
+      # (192.0.2.0 is a special IP address that can be used in only documentation. Ref. RFC 5737)
+      logger = Fluent::Logger::FluentLogger.new(nil, host: '192.0.2.0', port: fluentd.port, timeout: 1)
+      expect(logger.last_error).to be_a_kind_of(Timeout::Error)
+    end
+  }
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -31,89 +30,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !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
+        version: '1.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: fluent logger for ruby
 email: frsyuki@gmail.com
 executables:
@@ -160,7 +89,6 @@ homepage: https://github.com/fluent/fluent-logger-ruby
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -175,8 +103,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: fluent logger for ruby
-test_files: []
+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