fluent-plugin-syslog-gobi-tls 2.1.16 → 2.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c2d387591fe9093d96dfbf685043fcab92c7ff8659fa4dd6a75d8007d609e3b
-  data.tar.gz: 06c6404a5d30c3d5cce6bfee75b44d674dce1125703f878f85b0c6e83b9e0004
+  metadata.gz: 287edad13098ed291c057cf494827592b646ae9b8ca58c3b80edb428f4500740
+  data.tar.gz: 84889f89cedcfc4b030015d63295992c75534bd6efaea86e9a571780e5e85be4
 SHA512:
-  metadata.gz: 7161bef620349319586ffa3698411032fb64d2198b02b2eed1269f846dc32b94b2e3b47510d128e773354eedfd7fa67083093e43d8fd04bc42d4760d45f6c262
-  data.tar.gz: 48b55f6eae0c446d9663c7af7ff827c70e1d04c461af28ede88889c6e8bd516caa08a3bc6f7b8f89e08ad98df0c4b42111e818d5b99e3a569d51f911d7f38a8c
+  metadata.gz: 32422e64ce1f4053f310bf57a4950831c8214dbd3b73c1cfd3199f93c2889da1dcbf3fcc688b9564509f95118ccf011f844ba973a07107979892a7df01b06d16
+  data.tar.gz: 00b1e2177e78009a05f682dbd668badc6c56cdbceee73346e7de3fe3c766838fa6d1804c5a02db5ed82b84d451c72342f327cb8da6158170513ff4218ae23533

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.16'
+  s.version       = '2.1.18'
   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,27 +39,17 @@ 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 => e
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in connect EAGAIN rescue: #{e.class} exception #{e.message} "
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
           select_with_timeout(@socket, :connect_read) && retry
-        rescue IO::WaitWritable => e
-          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{timestamp}] in connect WaitWritable rescue: #{e.class} exception #{e.message} "
+        rescue IO::WaitWritable
           select_with_timeout(@socket, :connect_write) && retry
         end
       rescue Errno::ETIMEDOUT
@@ -69,8 +59,6 @@ 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
@@ -84,34 +72,20 @@ 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 => 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 => 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")}"
+      # 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 Exception => e
+        # Log the exception
+        puts "Exception during TCP connection: #{e.message}"
         tcp.close rescue nil
         raise
       end
@@ -121,9 +95,6 @@ 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
@@ -210,17 +181,7 @@ module SyslogTls
       else
         raise "Unknown select type #{type}"
       end
-      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
+      IO.select(*args) || raise("Socket timeout during #{type}")
     end
 
     # Forward any methods directly to SSLSocket

metadata

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