fluent-plugin-syslog-gobi-tls 2.1.34 → 2.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f4f0cabbf4f3247aaac152fc8091b9afe7b328df68716561e9e10c73412203
-  data.tar.gz: a9c8fadfc6f1eab6b41dfbda941a2cfa62a9b91d7a600c9724bdc728a6059899
+  metadata.gz: e2295310b3202cba1128712e76396c65fa7780d4911408b9314bcbf723122781
+  data.tar.gz: 93d14bbb1f93cdcd60953293d2b5e3141545c6014955c9254030636958bc134a
 SHA512:
-  metadata.gz: dc4af9190bba0089b1cfa4efcad20439a3d4b746cd781b5ce94aa594f6d76812d370914c87255c4b883909cf1126ed813d9caef2238f2e3bbde5fcda6bc0bf65
-  data.tar.gz: 3015b504cf2d4eee31b4afd452e8ff189fb79704947c6ff0eaa8e55de69b81503fc16bcac27195a67c58ec13346b6d0be490ff04e2516ee8410faae6f00bb9c0
+  metadata.gz: 445f0af339ff7b18cdb31c80f256d6b63e118f2afc7690fa24635a30e1616615337aefe1a463e51416380a510207dbe293769c508d0b14b56143d25e1591d76d
+  data.tar.gz: 15313e80462897614b1a389f5979499fd1f1535e6c45783726745fd1b6b48e57441d17547555747eca8a11885aa91a6bd2532b21c98411aa65c28a398743626e

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.34'
+  s.version       = '2.1.35'
   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

@@ -30,6 +30,9 @@ def add_host_backoff_spec(retries_to_do, host_ip_port)
 end
 
 def can_write(host_ip_port)
+  if !conatins_host(host_ip_port)
+    add_host_backoff_spec(0, host_ip_port)
+  end
   begin
     $host_backoff_specs_list.each do |backoff_specs|
       if backoff_specs.hostIPport == host_ip_port
@@ -45,6 +48,9 @@ end
 
 def increase_retry(host_ip_port)
   pp "1 :: increase_retry :: " + host_ip_port + " time :: " + Time.now.to_s
+  if !conatins_host(host_ip_port)
+    add_host_backoff_spec(0, host_ip_port)
+  end
   begin
     $host_backoff_specs_list.each do |backoff_specs|
       pp "1 :: increase_retry :: backoff_specs.hostIPport " + backoff_specs.hostIPport + " time :: " + Time.now.to_s
@@ -58,6 +64,9 @@ def increase_retry(host_ip_port)
 end
 
 def reset_tries(host_ip_port)
+  if !conatins_host(host_ip_port)
+    add_host_backoff_spec(0, host_ip_port)
+  end
   $host_backoff_specs_list.each do |backoff_specs|
     if backoff_specs.hostIPport == host_ip_port
       backoff_specs.resetRetries
@@ -65,6 +74,15 @@ def reset_tries(host_ip_port)
   end
 end
 
+def conatins_host(host_ip_port)
+  $host_backoff_specs_list.each do |backoff_specs|
+    if backoff_specs.hostIPport == host_ip_port
+      return true
+    end
+  end
+  return false
+end
+
 module Fluent::Plugin
   class SyslogTlsOutput < Output
     Fluent::Plugin.register_output('syslog_tls', self)

data/lib/syslog_tls/host_backoff_specs.rb

@@ -18,11 +18,14 @@ module SyslogTls
         time_passed_since_failure = time_passed_since_failure.round(2)
       end
       if time_passed_since_failure == -1
+        pp "canwrite writting :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
         return 1
       end
       if time_passed_since_failure > @baseThreshold ** @retriesToDo
+        pp "canwrite writting after backoff :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
         return 1
       else
+        pp "canwrite cannot write BACKINGOFFF :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
         return 0
       end
     end
@@ -30,6 +33,7 @@ module SyslogTls
     def failtowrite
       @retriesToDo += 1
       @failTime = Time.now
+      pp "failtowrite :: " + @retriesToDo.to_s + " time :: " + Time.now.to_s
     end
 
     def resetRetries

data/lib/syslog_tls/ssl_transport.rb

@@ -193,24 +193,30 @@ module SyslogTls
       else
         raise "Unknown select type #{type}"
       end
-      pp "2: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
-      if can_write(host_ip_port) == 1
-        pp "3: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
-        ready_sockets, _, _ = IO.select(*args)
-        pp "ready_sockets :: " + ready_sockets.to_s + " :: " + host_ip_port + " time :: " + Time.now.to_s
-        if ready_sockets
-          pp "4: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
-          reset_tries(host_ip_port)
+      if type.to_s == "connect_write"
+        pp "2: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
+        if can_write(host_ip_port) == 1
+          pp "3: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
+          io_select_return = IO.select(*args)
+          ready_sockets, _, _ = io_select_return
+          pp "ready_sockets :: " + ready_sockets.to_s + " :: " + host_ip_port + " time :: " + Time.now.to_s
+          pp "io_select_return :: " + io_select_return.to_s + " :: " + host_ip_port + " time :: " + Time.now.to_s
+          if !ready_sockets.empty?
+            pp "4: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
+            reset_tries(host_ip_port)
+            io_select_return
+          else
+            increase_retry(host_ip_port)
+            pp "initialize SSLTransport.select_with_timeout :: Socket timeout" + " time :: " + Time.now.to_s
+            io_select_return || raise("Socket timeout during #{type}")
+          end
         else
-          increase_retry(host_ip_port)
-          pp "initialize SSLTransport.select_with_timeout :: Socket timeout" + " time :: " + Time.now.to_s
-          raise("Socket timeout during #{type}")
+          pp "initialize SSLTransport.select_with_timeout :: Failed to write" + " time :: " + Time.now.to_s
+          io_select_return || raise("Failed to write #{type}")
         end
       else
-        pp "initialize SSLTransport.select_with_timeout :: Failed to write" + " time :: " + Time.now.to_s
-        raise("Failed to write #{type}")
+        IO.select(*args) || raise("Socket timeout during #{type}")
       end
-      ready_sockets || raise("Socket timeout during #{type}")
     end
 
     # Forward any methods directly to SSLSocket

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-gobi-tls
 version: !ruby/object:Gem::Version
-  version: 2.1.34
+  version: 2.1.35
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd