fluent-plugin-syslog-gobi-tls 2.1.5 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e41fd051b3a254c8f8b0c915bdee27d8cf99b0ee081839d5d67e649a7d5d3e60
-  data.tar.gz: 60c673e134c6a21214478c6c12dc0f988f8b43ca2f9d461d2738301c8ecc763e
+  metadata.gz: f830f23b5e82896b3102d02ceadaa39df253b7e8bf5d62f7b6722cad71e3ed0e
+  data.tar.gz: 1f54823c1dd108ad3dc4512dcbaa9f6261ba267219e79af9dcde0c434259bbc0
 SHA512:
-  metadata.gz: d33a699126f2e61f4e093a484cd8d0d65b8d06bd04052b30dd0ccc029c99d9e938cad57727918ad516bf97c66a72d668da780d48cc2b366362819fed0ee1fdf6
-  data.tar.gz: 76ab5b598ad23e644ee547d9699be9d008e083e774f5f4c5dc6820f0fe2673d0821837acd5a5493a9f32e0885007ae30cd68f4106aec6a218fee235f94eda854
+  metadata.gz: a137d1c350c3b49ca66c0baeb71d08b277dcfc5d71bb0db1b7b298dba77546a25e5a05fc5ce079dbf0ab207af5b3a7571bc1027af8a5251e0c6527e7f545772e
+  data.tar.gz: 3261fc10825eee93d250e60ace893fcc778c52b693e24eb16c12a42b767bf28fb66c2f0b6fda93fc8b1a32b28d88d7471debf1b55a562ad855d19f6a30f6d02f

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.5'
+  s.version       = '2.1.8'
   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,8 +22,7 @@ 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
@@ -43,49 +42,22 @@ module SyslogTls
       connect
     end
 
-    def connect_with_backoff
-      retries = 0
-      backoff_delay = INITIAL_BACKOFF_DELAY
-  
-      loop do
+    def connect
+      @socket = get_ssl_connection
+      begin
         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
 
@@ -101,14 +73,16 @@ module SyslogTls
         tcp.setsockopt(Socket::SOL_SOCKET, Socket::Constants::SO_REUSEPORT, true)
         tcp.connect_nonblock(sock_addr)
       rescue Errno::EINPROGRESS
-        select_with_timeout(tcp, :connect_write)
-        begin
-          tcp.connect_nonblock(sock_addr)
-        rescue Errno::EISCONN
-          # all good
-        rescue SystemCallError
-          tcp.close rescue nil
-          raise
+        tcp.close rescue nil
+        raise
+        # select_with_timeout(tcp, :connect_write)
+        # begin
+        #   tcp.connect_nonblock(sock_addr)
+        # rescue Errno::EISCONN
+        #   # all good
+        # rescue SystemCallError
+        #   tcp.close rescue nil
+        #   raise
         end
       rescue SystemCallError
         tcp.close rescue nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-gobi-tls
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.8
 platform: ruby
 authors:
 - thomas morgan