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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f830f23b5e82896b3102d02ceadaa39df253b7e8bf5d62f7b6722cad71e3ed0e
-  data.tar.gz: 1f54823c1dd108ad3dc4512dcbaa9f6261ba267219e79af9dcde0c434259bbc0
+  metadata.gz: e196efd2063d6ae5894d0f08837a7244f6f079e86253fb28e5622f53f3915d38
+  data.tar.gz: 6f63b49f7216216981e632f0f5449d76acd675c007bd775f51ca28ce32ac9926
 SHA512:
-  metadata.gz: a137d1c350c3b49ca66c0baeb71d08b277dcfc5d71bb0db1b7b298dba77546a25e5a05fc5ce079dbf0ab207af5b3a7571bc1027af8a5251e0c6527e7f545772e
-  data.tar.gz: 3261fc10825eee93d250e60ace893fcc778c52b693e24eb16c12a42b767bf28fb66c2f0b6fda93fc8b1a32b28d88d7471debf1b55a562ad855d19f6a30f6d02f
+  metadata.gz: ef2edc80b26fdf6122101671c2d1605419797420dad0e44ddabfabd94ef1dd514a91ae1aabb18bbe392da5ac9a51f2c1ef596977735e7f0da79cc68cf105b9a8
+  data.tar.gz: d64f19a16369c6aa59d97cb674c4824b6dc2ccf7b5553e17bd0f494a24f330c43867da9f2998481d2f7bfb305cad458ab8e7f22b3a41cbd8fe235e1728301999

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

data/lib/syslog_tls/ssl_transport.rb

@@ -39,17 +39,27 @@ module SyslogTls
       @verify_cert_name = verify_cert_name
       @ssl_version = ssl_version
       @retries = max_retries
+      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+      puts "[#{timestamp}] in initialize: #{idle_timeout}"
       connect
     end
 
     def connect
+      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+      puts "[#{timestamp}] in connect"
       @socket = get_ssl_connection
       begin
         begin
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{timestamp}] in connect doing connect_nonblock"
           @socket.connect_nonblock
-        rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable => e
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{timestamp}] in connect EAGAIN rescue: #{e.class} exception during #{type}: #{e.message} "
           select_with_timeout(@socket, :connect_read) && retry
-        rescue IO::WaitWritable
+        rescue IO::WaitWritable => e
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{timestamp}] in connect WaitWritable rescue: #{e.class} exception during #{type}: #{e.message} "
           select_with_timeout(@socket, :connect_write) && retry
         end
       rescue Errno::ETIMEDOUT
@@ -59,6 +69,8 @@ module SyslogTls
     end
 
     def get_tcp_connection
+      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+      puts "[#{timestamp}] in get_tcp_connection"
       tcp = nil
 
       family = Socket::Constants::AF_UNSPEC
@@ -72,19 +84,34 @@ module SyslogTls
         tcp.setsockopt(Socket::SOL_SOCKET, Socket::Constants::SO_REUSEADDR, true)
         tcp.setsockopt(Socket::SOL_SOCKET, Socket::Constants::SO_REUSEPORT, true)
         tcp.connect_nonblock(sock_addr)
-      rescue Errno::EINPROGRESS
-        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
+      rescue Errno::EINPROGRESS => e
+        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+        puts "[#{timestamp}] in get_tcp_connection EINPROGRESS exception during TCP connection:"
+        puts "[#{timestamp}] Message: #{e.message}"
+        puts "[#{timestamp}] Backtrace: #{e.backtrace.join("\n")}"
+
+        select_with_timeout(tcp, :connect_write)
+        begin
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{timestamp}] in get_tcp_connection after select_with_timeout"
+          tcp.connect_nonblock(sock_addr)
+        rescue Errno::EISCONN
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{timestamp}] in get_tcp_connection in EISCONN"
+          # all good
+        rescue SystemCallError => e
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{timestamp}] in get_tcp_connection SystemCallError exception during TCP connection:"
+          puts "[#{timestamp}] Message: #{e.message}"
+          puts "[#{timestamp}] Backtrace: #{e.backtrace.join("\n")}"
+          tcp.close rescue nil
+          raise
         end
-      rescue SystemCallError
+      rescue SystemCallError => e
+        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+        puts "[#{timestamp}] in get_tcp_connection SystemCallError outer exception during TCP connection:"
+        puts "[#{timestamp}] Message: #{e.message}"
+        puts "[#{timestamp}] Backtrace: #{e.backtrace.join("\n")}"
         tcp.close rescue nil
         raise
       end
@@ -94,6 +121,9 @@ module SyslogTls
     end
 
     def get_ssl_connection
+      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+      puts "[#{timestamp}] in get_ssl_connection"
+
       tcp = get_tcp_connection
 
       ctx = OpenSSL::SSL::SSLContext.new
@@ -180,7 +210,17 @@ module SyslogTls
       else
         raise "Unknown select type #{type}"
       end
-      IO.select(*args) || raise("Socket timeout during #{type}")
+      begin
+        result = IO.select(*args) || raise("Socket timeout during #{type}")
+        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+        puts "[#{timestamp}] in select_with_timeout: IO.select result during #{type}: #{result.inspect}"
+        # Code that may raise exceptions
+      rescue => e
+        # Catch all exceptions and log for testing/debugging
+        timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+        puts "[#{timestamp}] Caught exception: #{e.class} - #{e.message}"
+        puts e.backtrace.join("\n")
+      end
     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.8
+  version: 2.1.15
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd