fluent-plugin-syslog-gobi-tls 2.1.27 → 2.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05dba789739e7d17d93ec0b6834f44f483c81110c0b7a3049b05d4363f4887c6
-  data.tar.gz: bebec7c5ce38b10f59703fb198a36cbcfe9f288f56185ad1731c917ddcc02be6
+  metadata.gz: 3cd2b97fbf5538d79f925edfa2231254929ad80295ef137ddd1f6f18dc38ebd7
+  data.tar.gz: 708b7e494707863e469776e94c942f81d556c2b6ccdb84c7d5d24ee244ce8eb6
 SHA512:
-  metadata.gz: 0271e8be2d6a57ae2ebea8f4141a7c621e07840e06c884317f6fb0d5a04d53d8f9f80aa61672c254d14861f2967e5e27a4fb2c6d68da589f895e3950c8cf27a8
-  data.tar.gz: e3d831b0a3cdeffce687482a6bc8b22ed6882c69404b7b808d785439b214ce459f0b87712f192276c5838fa938973ea894e26cec0b8c54fdac622c180288f973
+  metadata.gz: a2b97e8aad0a0414ea98e9c31d2e59fa767333f3b15133fcbf702304e80bef1982745ddea8f7a191ab7f32fc29c437f8da679c1188f1285c95b533e4b12cfbd7
+  data.tar.gz: fb54c28711b00c1bdf00ef0e38f7c4609e4f7091ae87d8243e11bdf326b59de4d3aca0c6acab5384539e15c7fa4a17ae6cbdab78863d7c2d0143a6dedbf42ca3

data/.gitignore

@@ -37,3 +37,4 @@ build/
 
 ## System
 .DS_Store
+.vscode

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-syslog-tls (2.1.0.rc1)
+    fluent-plugin-syslog-tls (2.1.0)
       fluentd (>= 0.14.0, < 2)
 
 GEM
@@ -9,35 +9,41 @@ GEM
   specs:
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    concurrent-ruby (1.1.10)
-    cool.io (1.7.1)
+    base64 (0.2.0)
+    concurrent-ruby (1.2.3)
+    cool.io (1.8.0)
     crack (0.4.5)
       rexml
+    csv (3.3.0)
     docile (1.4.0)
-    fluentd (1.15.3)
+    drb (2.2.1)
+    fluentd (1.17.0)
+      base64 (~> 0.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
+      csv (~> 3.2)
+      drb (~> 2.2)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.3.0, < 3.0.0)
-      sigdump (~> 0.2.2)
+      serverengine (>= 2.3.2, < 3.0.0)
+      sigdump (~> 0.2.5)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
-      webrick (>= 1.4.2, < 1.8.0)
+      webrick (~> 1.4)
       yajl-ruby (~> 1.0)
     hashdiff (1.0.1)
     http_parser.rb (0.8.0)
     minitest (5.17.0)
     minitest-stub_any_instance (1.0.3)
-    msgpack (1.6.0)
+    msgpack (1.7.2)
     power_assert (2.0.3)
     public_suffix (5.0.1)
     rake (13.0.6)
     rexml (3.2.5)
-    serverengine (2.3.1)
+    serverengine (2.3.2)
       sigdump (~> 0.2.2)
-    sigdump (0.2.4)
+    sigdump (0.2.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -47,15 +53,15 @@ GEM
     strptime (0.2.5)
     test-unit (3.5.7)
       power_assert
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
+    tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS

data/fluent-plugin-syslog-tls.gemspec

@@ -19,10 +19,10 @@ require 'syslog_tls/version'
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-syslog-gobi-tls'
-  s.version       = '2.1.27'
-  s.summary       = %q{Fluent Syslog TLS output plugin}
+  s.version       = '2.1.29'
   s.authors       = ['thomas morgan']
   s.email         = ['tm@iprog.com']
+  s.summary       = %q{Fluent Syslog TLS output plugin}
   s.description   = %q{Syslog TLS output plugin with formatting support, for Fluentd}
   s.homepage      = 'https://github.com/zarqman/fluent-plugin-syslog-tls'
   s.license       = 'Apache v2'

data/lib/fluent/plugin/out_syslog_tls.rb

@@ -16,6 +16,48 @@
 require 'socket'
 require 'syslog_tls/logger'
 require 'fluent/plugin/output'
+require 'syslog_tls/host_backoff_specs'
+require 'pp'
+
+$host_backoff_specs_list = []
+
+def add_host_backoff_spec(retries_to_do, host_ip_port)
+  # Check if an element with the same hostIPport already exists
+  return if $host_backoff_specs_list.any? { |spec| spec.hostIPport == host_ip_port }
+
+  # If not, add a new HostBackoffSpecs instance to the global array
+  $host_backoff_specs_list << ::SyslogTls::HostBackoffSpecs.new(retries_to_do, host_ip_port)
+end
+
+def can_write(host_ip_port)
+  begin
+    $host_backoff_specs_list.each do |backoff_specs|
+      if backoff_specs.hostIPport == host_ip_port
+        return backoff_specs.canwrite
+      end
+    end
+  rescue => e
+    pp "Error in can_write: #{e.message}"
+    return 0
+  end
+  return 1
+end
+
+def increase_retry(host_ip_port)
+  $host_backoff_specs_list.each do |backoff_specs|
+    if backoff_specs.hostIPport == host_ip_port
+      backoff_specs.failtowrite
+    end
+  end
+end
+
+def reset_tries(host_ip_port)
+  $host_backoff_specs_list.each do |backoff_specs|
+    if backoff_specs.hostIPport == host_ip_port
+      backoff_specs.resetRetries
+    end
+  end
+end
 
 module Fluent::Plugin
   class SyslogTlsOutput < Output
@@ -82,6 +124,8 @@ module Fluent::Plugin
         @mappings[key_name] = conf[conf_key] if conf.key?(conf_key)
       end
 
+      add_host_backoff_spec(0, conf['host']+":"+conf['port'])
+
       @formatter = formatter_create(conf: conf.elements('format').first, default_type: DEFAULT_FORMAT_TYPE)
     end
 

data/lib/syslog_tls/ssl_transport.rb

@@ -15,6 +15,7 @@
 
 require 'socket'
 require 'openssl'
+require 'pp'
 
 module SyslogTls
   # Supports SSL connection to remote host
@@ -39,27 +40,17 @@ module SyslogTls
       @verify_cert_name = verify_cert_name
       @ssl_version = ssl_version
       @retries = max_retries
-      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts "[#{timestamp}] in initialize: #{idle_timeout}"
       connect
     end
 
     def connect
-      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts "[#{timestamp}] in connect"
       @socket = get_ssl_connection
       begin
         begin
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in connect doing connect_nonblock"
           @socket.connect_nonblock
-        rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable => e
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in connect EAGAIN rescue: #{e.class} exception #{e.message} "
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
           select_with_timeout(@socket, :connect_read) && retry
-        rescue IO::WaitWritable => e
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in connect WaitWritable rescue: #{e.class} exception #{e.message} "
+        rescue IO::WaitWritable
           select_with_timeout(@socket, :connect_write) && retry
         end
       rescue Errno::ETIMEDOUT
@@ -69,54 +60,30 @@ module SyslogTls
     end
 
     def get_tcp_connection
-      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts "[#{timestamp}] in get_tcp_connection"
       tcp = nil
 
       family = Socket::Constants::AF_UNSPEC
       sock_type = Socket::Constants::SOCK_STREAM
       addr_info = Socket.getaddrinfo(host, port, family, sock_type, nil, nil, false).first
-      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts "[#{timestamp}] in get_tcp_connection addr_info: #{addr_info}"
       _, port, _, address, family, sock_type = addr_info
 
       begin
         sock_addr = Socket.sockaddr_in(port, address)
         tcp = Socket.new(family, sock_type, 0)
-        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{timestamp}] in get_tcp_connection tcp: #{tcp}"
         tcp.setsockopt(Socket::SOL_SOCKET, Socket::Constants::SO_REUSEADDR, true)
         tcp.setsockopt(Socket::SOL_SOCKET, Socket::Constants::SO_REUSEPORT, true)
         tcp.connect_nonblock(sock_addr)
-      rescue Errno::ECONNREFUSED => e
-        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{timestamp}] in get_tcp_connection ECONNREFUSED exception during TCP connection:"
-        tcp.close rescue nil
-        raise
-      rescue Errno::EINPROGRESS => e
-        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{timestamp}] in get_tcp_connection EINPROGRESS exception during TCP connection:"
-        puts "[#{timestamp}] Message: #{e.message}"
+      rescue Errno::EINPROGRESS
         select_with_timeout(tcp, :connect_write)
         begin
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in get_tcp_connection after select_with_timeout"
           tcp.connect_nonblock(sock_addr)
         rescue Errno::EISCONN
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in get_tcp_connection in EISCONN"
           # all good
-        rescue SystemCallError => e
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in get_tcp_connection SystemCallError exception during TCP connection:"
-          puts "[#{timestamp}] Message: #{e.message}"
+        rescue SystemCallError
           tcp.close rescue nil
           raise
         end
-      rescue SystemCallError => e
-        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{timestamp}] in get_tcp_connection SystemCallError outer exception during TCP connection:"
-        puts "[#{timestamp}] Message: #{e.message}"
+      rescue SystemCallError
         tcp.close rescue nil
         raise
       end
@@ -126,8 +93,6 @@ module SyslogTls
     end
 
     def get_ssl_connection
-      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts "[#{timestamp}] in get_ssl_connection"
       tcp = get_tcp_connection
 
       ctx = OpenSSL::SSL::SSLContext.new
@@ -202,6 +167,8 @@ module SyslogTls
     end
 
     def select_with_timeout(tcp, type)
+      host_ip_port = host + ":" + port.to_s
+
       case type
       when :connect_read
         args = [[tcp], nil, nil, CONNECT_TIMEOUT]
@@ -214,14 +181,15 @@ module SyslogTls
       else
         raise "Unknown select type #{type}"
       end
-      # IO.select(*args) || raise("Socket timeout during #{type}")
-      begin
-        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        select1 = IO.select(*args)
-        puts "[#{timestamp}] in select_with_timeout: #{select1}"
-      rescue IOError => e
-        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{timestamp}] Error in select_with_timeout: #{e.message}"
+      if can_write(host_ip_port) == 1
+        if IO.select(*args)
+          reset_tries(host_ip_port)
+        else
+          increase_retry(host_ip_port)
+          raise("Socket timeout during #{type}")
+        end
+      else
+        raise("Failed to write #{type}")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-gobi-tls
 version: !ruby/object:Gem::Version
-  version: 2.1.27
+  version: 2.1.29
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fluent Syslog TLS output plugin