Add connect_timeout / resolve_timeout option

Signed-off-by: Shizuo Fujita <[email protected]>

Author: Watson1978

README.md

@@ -148,6 +148,14 @@ 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`
 
+#### connect_timeout (Integer)
+
+Specify timeout in seconds from connecting. Default: `nil`
+
+#### resolve_timeout (Integer)
+
+Specify timeout in seconds from when the hostname resolution starts. Default: `nil`
+
 #### buffer_overflow_handler (Proc)
 
 Pass callback for handling buffer overflow with pending data. See "Buffer overflow" section.

fluent-logger.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.license       = "Apache-2.0"
 
+  gem.required_ruby_version = '>= 2.7'
+
   gem.add_dependency "msgpack", ">= 1.0.0", "< 2"
 
   # logger gem that isn't default gems as of Ruby 3.5

lib/fluent/logger/fluent_logger.rb

@@ -115,6 +115,9 @@ def initialize(tag_prefix = nil, *args)
         @wait_writeable = true
         @wait_writeable = options[:wait_writeable] if options.key?(:wait_writeable)
 
+        @connect_timeout = options[:connect_timeout]
+        @resolv_timeout = options[:resolv_timeout]
+
         @last_error = {}
 
         begin
@@ -170,7 +173,7 @@ def create_socket!
         if @socket_path
           @con = UNIXSocket.new(@socket_path)
         else
-          @con = TCPSocket.new(@host, @port)
+          @con = Socket.tcp(@host, @port, connect_timeout: @connect_timeout, resolv_timeout: @resolv_timeout)
           if @tls_options
             context = OpenSSL::SSL::SSLContext.new
             if @tls_options[:insecure]