fluent-plugin-syslog-gobi-tls 2.1.28 → 2.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7588960a6c14e25d874b1621b23ccddeec6a68f7bdb6865190d27458d9ba8bb4
-  data.tar.gz: c1c8dcb3ea00c5d36251c82551f8a5edc2ee2d01429c05ac9d0a8dab349c808b
+  metadata.gz: 79ff3a260ddc3cfea4990af9d84b44884ab3f0104e01c7e697bd17d5acc1b024
+  data.tar.gz: 33fee4ba277d9db09fd18d42479af95ac1882fbad918a8823992bb3e302cb22c
 SHA512:
-  metadata.gz: b9bc4d9ffc76e3c518069991b88c6010448b1d1e50573e0c2fa1ed6dd96b29b999eb29c29641f0470c6fd5e2a9e518b4e482acdcbc801c09b39b1d6a940fafbb
-  data.tar.gz: 1872801c5822904d6ae2c94ba9e86941deece593fd49e74608bef484606a2730eb27e96c40c30f2dba2ef2ea8487230276775b1dea2892787d3b2cd56564feaf
+  metadata.gz: 9a4ef8654a33593e90536aeb2a4694b6f199827b1b3437ad0190de72b6df3ec97ce5923aae18034d38362640aa4a8047d128cf681c67ac7591bc50a998403121
+  data.tar.gz: 8101fa0ee62becadfe46960a41cae3d4c0ffda769b3033cb9adf98a613de7214c59c4c154d15ee8dbfff644d8102480e19ee63344cee45c08417080ef58bf9cd

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,7 +19,7 @@ require 'syslog_tls/version'
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-syslog-gobi-tls'
-  s.version       = '2.1.28'
+  s.version       = '2.1.30'
   s.authors       = ['thomas morgan']
   s.email         = ['tm@iprog.com']
   s.summary       = %q{Fluent Syslog TLS output plugin}

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/host_backoff_specs.rb

@@ -0,0 +1,40 @@
+require 'pp'
+
+module SyslogTls
+  class HostBackoffSpecs
+    attr_accessor :retriesToDo, :hostIPport
+
+    def initialize(retries_to_do, host_ip_port)
+      @retriesToDo = retries_to_do
+      @hostIPport = host_ip_port
+      @failTime = nil
+      @baseThreshold = 2
+    end
+
+    def canwrite
+      time_passed_since_failure = -1
+      if @failTime != nil
+        time_passed_since_failure = Time.now - @failTime
+        time_passed_since_failure = time_passed_since_failure.round(2)
+      end
+      if time_passed_since_failure == -1
+        return 1
+      end
+      if time_passed_since_failure > @baseThreshold ** @retriesToDo
+        return 1
+      else
+        return 0
+      end
+    end
+
+    def failtowrite
+      @retriesToDo += 1
+      @failTime = Time.now
+    end
+
+    def resetRetries
+      @retriesToDo = 0
+      @failTime = nil
+    end
+  end
+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
@@ -166,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]
@@ -178,7 +181,16 @@ module SyslogTls
       else
         raise "Unknown select type #{type}"
       end
-      IO.select(*args) || raise("Socket timeout during #{type}")
+      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
 
     # Forward any methods directly to SSLSocket

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-gobi-tls
 version: !ruby/object:Gem::Version
-  version: 2.1.28
+  version: 2.1.30
 platform: ruby
 authors:
 - thomas morgan
@@ -134,6 +134,7 @@ files:
 - fluent-plugin-syslog-tls.gemspec
 - lib/fluent/plugin/out_syslog_tls.rb
 - lib/syslog_tls/facility.rb
+- lib/syslog_tls/host_backoff_specs.rb
 - lib/syslog_tls/logger.rb
 - lib/syslog_tls/lookup_from_const.rb
 - lib/syslog_tls/protocol.rb