fluent-plugin-syslog-gobi-tls 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00795bf5901d0f408fef9bb0f83719b69bf6ed35caa7404480bc80e37a673ea6'
-  data.tar.gz: 90e250623d326e405fc89d08a7e50fa63eddea51e708278f7da3db505133b0c6
+  metadata.gz: 5ce630881b7eec5768670ea60b861b14bd4c434aab48ab369001e48542d46ea3
+  data.tar.gz: 4958d79dad16536b4e4bfd42a29bac7b88cb668dfeb01d24ddd12b5ee1f13669
 SHA512:
-  metadata.gz: 01fa201ac15dd4aa7f0c10f4e0c95e53ad0a88776d63034866f4e4385a96a7262ef01145aef3e1c5cd284e562455e08fb459539a4aa4e51a14b46f292265eab7
-  data.tar.gz: 88581578d6eda87732511b1ac8532594691084c0b117fcc042ca20fcb3f031208aa5e85a482fbb1dc224f62fa5d3535298d13c693ab46941ad05010325aef4d9
+  metadata.gz: 1e9e3c29a23cd9c198427522105258945195f187018c0f625afa33c420c7bdd0be55d4f746408bf9403372b78df062e22cc2d745bf1ad5b05031ec2fde1f7e98
+  data.tar.gz: a63f9d6b293c66bafeda9fa58aa8ce260ee73cf00cbf665071f11968d2400ddb1d418e33484bd1b67f2bbcfa5a52cfb749575c9620301b19bc10e6dc48793f30

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.2'
+  s.version       = '2.1.4'
   s.summary       = %q{Fluent Syslog TLS output plugin}
   s.authors       = ['thomas morgan']
   s.email         = ['tm@iprog.com']

data/lib/syslog_tls/ssl_transport.rb

@@ -22,7 +22,8 @@ module SyslogTls
     CONNECT_TIMEOUT = 10
     # READ_TIMEOUT    = 5
     WRITE_TIMEOUT   = 5
-
+    MAX_BACKOFF_RETRIES = 5
+    INITIAL_BACKOFF_DELAY = 1
     attr_accessor :socket
 
     attr_reader :host, :port, :idle_timeout, :ca_cert, :client_cert, :client_key, :verify_cert_name, :ssl_version
@@ -42,22 +43,49 @@ module SyslogTls
       connect
     end
 
-    def connect
-      @socket = get_ssl_connection
-      begin
+    def connect_with_backoff
+      retries = 0
+      backoff_delay = INITIAL_BACKOFF_DELAY
+  
+      loop do
         begin
+          @socket = get_ssl_connection
           @socket.connect_nonblock
+          break
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
           select_with_timeout(@socket, :connect_read) && retry
         rescue IO::WaitWritable
           select_with_timeout(@socket, :connect_write) && retry
+        rescue Errno::ETIMEDOUT
+          raise 'Socket timeout during connect' if retries >= MAX_BACKOFF_RETRIES
+  
+          # Exponential backoff
+          retries += 1
+          sleep(backoff_delay)
+          backoff_delay *= 2
         end
-      rescue Errno::ETIMEDOUT
-        raise 'Socket timeout during connect'
       end
+  
       @last_write = Time.now if idle_timeout
     end
 
+    def connect
+      connect_with_backoff
+      #@socket = get_ssl_connection
+      #begin
+       # begin
+        #  @socket.connect_nonblock
+        #rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
+        #  select_with_timeout(@socket, :connect_read) && retry
+        #rescue IO::WaitWritable
+        #  select_with_timeout(@socket, :connect_write) && retry
+        #end
+      #rescue Errno::ETIMEDOUT
+      #  raise 'Socket timeout during connect'
+      #end
+      #@last_write = Time.now if idle_timeout
+    end
+
     def get_tcp_connection
       tcp = nil
 
@@ -170,7 +198,7 @@ module SyslogTls
       when :connect_read
         args = [[tcp], nil, nil, CONNECT_TIMEOUT]
       when :connect_write
-        args = [nil, [tcp], nil, 0]
+        args = [nil, [tcp], nil, 1]
       # when :read
       #   args = [[tcp], nil, nil, READ_TIMEOUT]
       when :write

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-gobi-tls
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd