fluent-plugin-syslog-gobi-tls 2.1.29 → 2.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cd2b97fbf5538d79f925edfa2231254929ad80295ef137ddd1f6f18dc38ebd7
-  data.tar.gz: 708b7e494707863e469776e94c942f81d556c2b6ccdb84c7d5d24ee244ce8eb6
+  metadata.gz: d1239c5bbd380b85554b58cccdaf872b54e893f2b13bf310fddb4e381c35df27
+  data.tar.gz: aa9b3bd1297a9ca116cb1737f6e30c7326f280b86429030887df4178f3667059
 SHA512:
-  metadata.gz: a2b97e8aad0a0414ea98e9c31d2e59fa767333f3b15133fcbf702304e80bef1982745ddea8f7a191ab7f32fc29c437f8da679c1188f1285c95b533e4b12cfbd7
-  data.tar.gz: fb54c28711b00c1bdf00ef0e38f7c4609e4f7091ae87d8243e11bdf326b59de4d3aca0c6acab5384539e15c7fa4a17ae6cbdab78863d7c2d0143a6dedbf42ca3
+  metadata.gz: 144f5e4c1c3763127d25b48945858a2af3dcef7acb3122ab56203502134bd77300319a03ab9ffc1188d846522b8c3ea454502a228e485f65b12d76ba014afab9
+  data.tar.gz: 2e3b936a295ee9fa013bc15d8d1fddf67ed4aaa50de95c77a4668501f30c9d66887978b66b699d28537e9825a000a24e9c96a8ff362d38f17fdb99801d4bb146

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

data/lib/syslog_tls/host_backoff_specs.rb

@@ -0,0 +1,40 @@
+require 'pp'
+
+module SyslogTls
+  class HostBackoffSpecs
+    attr_accessor :retriesToDo, :hostIPport
+
+    def initialize(retries_to_do, host_ip_port)
+      @retriesToDo = retries_to_do
+      @hostIPport = host_ip_port
+      @failTime = nil
+      @baseThreshold = 2
+    end
+
+    def canwrite
+      time_passed_since_failure = -1
+      if @failTime != nil
+        time_passed_since_failure = Time.now - @failTime
+        time_passed_since_failure = time_passed_since_failure.round(2)
+      end
+      if time_passed_since_failure == -1
+        return 1
+      end
+      if time_passed_since_failure > @baseThreshold ** @retriesToDo
+        return 1
+      else
+        return 0
+      end
+    end
+
+    def failtowrite
+      @retriesToDo += 1
+      @failTime = Time.now
+    end
+
+    def resetRetries
+      @retriesToDo = 0
+      @failTime = nil
+    end
+  end
+end

data/lib/syslog_tls/ssl_transport.rb

@@ -31,6 +31,7 @@ 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
@@ -44,18 +45,24 @@ module SyslogTls
     end
 
     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
 
@@ -125,7 +132,9 @@ 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
@@ -134,6 +143,7 @@ module SyslogTls
         end
       end
       begin
+        pp "initialize SSLTransport.write !idle_timeout"
         retry_id ||= 0
         do_write(s)
       rescue => e
@@ -167,7 +177,9 @@ module SyslogTls
     end
 
     def select_with_timeout(tcp, type)
+
       host_ip_port = host + ":" + port.to_s
+      pp "initialize SSLTransport.select_with_timeout :: " + host_ip_port
 
       case type
       when :connect_read
@@ -186,9 +198,11 @@ module SyslogTls
           reset_tries(host_ip_port)
         else
           increase_retry(host_ip_port)
+          pp "initialize SSLTransport.select_with_timeout :: Socket timeout"
           raise("Socket timeout during #{type}")
         end
       else
+        pp "initialize SSLTransport.select_with_timeout :: Failed to write"
         raise("Failed to write #{type}")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-gobi-tls
 version: !ruby/object:Gem::Version
-  version: 2.1.29
+  version: 2.1.31
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -134,6 +134,7 @@ files:
 - fluent-plugin-syslog-tls.gemspec
 - lib/fluent/plugin/out_syslog_tls.rb
 - lib/syslog_tls/facility.rb
+- lib/syslog_tls/host_backoff_specs.rb
 - lib/syslog_tls/logger.rb
 - lib/syslog_tls/lookup_from_const.rb
 - lib/syslog_tls/protocol.rb