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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f4f0cabbf4f3247aaac152fc8091b9afe7b328df68716561e9e10c73412203
-  data.tar.gz: a9c8fadfc6f1eab6b41dfbda941a2cfa62a9b91d7a600c9724bdc728a6059899
+  metadata.gz: 4f1260ee80a0b5a4e6a50278b3f882c3110a8a668504636c8c42b8305dfbf79d
+  data.tar.gz: 84c64d91c00a2e5e8cb45bb0ccee71dc9a52cca335fa5e323fa5251c25849d3d
 SHA512:
-  metadata.gz: dc4af9190bba0089b1cfa4efcad20439a3d4b746cd781b5ce94aa594f6d76812d370914c87255c4b883909cf1126ed813d9caef2238f2e3bbde5fcda6bc0bf65
-  data.tar.gz: 3015b504cf2d4eee31b4afd452e8ff189fb79704947c6ff0eaa8e55de69b81503fc16bcac27195a67c58ec13346b6d0be490ff04e2516ee8410faae6f00bb9c0
+  metadata.gz: 9345dd2aef77181aedb9592bb902c70254af0ccca25f03f20dde25f7ae34423a2120bfad9a21e7ed921a16f0ae4a68d013829bc30f944db0861d1509889b585f
+  data.tar.gz: c29439b149b58fc2645f2abb6a42eb64f4875a4ee09ce7c99dd34b2b7bbc619d8c3f7b9847ad56586ef82f5d2edd03ccbfd24303edaeb91ae6d413a59d69dbe0

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.36'
   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
@@ -44,10 +47,11 @@ def can_write(host_ip_port)
 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
       if backoff_specs.hostIPport == host_ip_port
         backoff_specs.failtowrite
       end
@@ -58,6 +62,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 +72,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

@@ -20,7 +20,12 @@ module SyslogTls
       if time_passed_since_failure == -1
         return 1
       end
-      if time_passed_since_failure > @baseThreshold ** @retriesToDo
+      backoffTime = @baseThreshold ** @retriesToDo
+      if backoffTime > 3600
+        backoffTime = 3600
+      end
+      if time_passed_since_failure > backoffTime
+        pp "canwrite writting after backoff :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
         return 1
       else
         return 0

data/lib/syslog_tls/ssl_transport.rb

@@ -31,7 +31,6 @@ module SyslogTls
     attr_writer :retries
 
     def initialize(host, port, idle_timeout: nil, ca_cert: 'system', client_cert: nil, client_key: nil, verify_cert_name: true, ssl_version: :TLS1_2, max_retries: 1)
-      pp "initialize SSLTransport"
       @host = host
       @port = port
       @idle_timeout = idle_timeout
@@ -46,23 +45,18 @@ module SyslogTls
 
     def connect
       timwnow = Time.now
-      pp "initialize SSLTransport.connect"+ timwnow.to_s
       @socket = get_ssl_connection
       begin
         begin
           @socket.connect_nonblock
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
-          pp "initialize SSLTransport Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable"
           select_with_timeout(@socket, :connect_read) && retry
         rescue IO::WaitWritable
-          pp "initialize SSLTransport IO::WaitWritable"
           select_with_timeout(@socket, :connect_write) && retry
         end
       rescue Errno::ETIMEDOUT
-        pp "initialize SSLTransport Errno::ETIMEDOUT"
         raise 'Socket timeout during connect'
       end
-      pp "initialize SSLTransport last_write"
       @last_write = Time.now if idle_timeout
     end
 
@@ -132,9 +126,7 @@ module SyslogTls
 
     # Allow to retry on failed writes
     def write(s)
-      pp "initialize SSLTransport.write"
       if idle_timeout
-        pp "initialize SSLTransport.write idle_timeout" + idle_timeout.to_s
         if (t=Time.now) > @last_write + idle_timeout
           @socket.close rescue nil
           connect
@@ -143,7 +135,6 @@ module SyslogTls
         end
       end
       begin
-        pp "initialize SSLTransport.write !idle_timeout"
         retry_id ||= 0
         do_write(s)
       rescue => e
@@ -177,10 +168,7 @@ module SyslogTls
     end
 
     def select_with_timeout(tcp, type)
-
       host_ip_port = host + ":" + port.to_s
-      pp "1: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
-
       case type
       when :connect_read
         args = [[tcp], nil, nil, CONNECT_TIMEOUT]
@@ -193,24 +181,23 @@ 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"
+        if can_write(host_ip_port) == 1
+          io_select_return = IO.select(*args)
+          ready_sockets, _, _ = io_select_return
+          if !ready_sockets.empty?
+            reset_tries(host_ip_port)
+            io_select_return
+          else
+            increase_retry(host_ip_port)
+            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}")
+          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.36
 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