fluent-plugin-syslog-gobi-tls 2.1.35 → 2.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2295310b3202cba1128712e76396c65fa7780d4911408b9314bcbf723122781
-  data.tar.gz: 93d14bbb1f93cdcd60953293d2b5e3141545c6014955c9254030636958bc134a
+  metadata.gz: 4f1260ee80a0b5a4e6a50278b3f882c3110a8a668504636c8c42b8305dfbf79d
+  data.tar.gz: 84c64d91c00a2e5e8cb45bb0ccee71dc9a52cca335fa5e323fa5251c25849d3d
 SHA512:
-  metadata.gz: 445f0af339ff7b18cdb31c80f256d6b63e118f2afc7690fa24635a30e1616615337aefe1a463e51416380a510207dbe293769c508d0b14b56143d25e1591d76d
-  data.tar.gz: 15313e80462897614b1a389f5979499fd1f1535e6c45783726745fd1b6b48e57441d17547555747eca8a11885aa91a6bd2532b21c98411aa65c28a398743626e
+  metadata.gz: 9345dd2aef77181aedb9592bb902c70254af0ccca25f03f20dde25f7ae34423a2120bfad9a21e7ed921a16f0ae4a68d013829bc30f944db0861d1509889b585f
+  data.tar.gz: c29439b149b58fc2645f2abb6a42eb64f4875a4ee09ce7c99dd34b2b7bbc619d8c3f7b9847ad56586ef82f5d2edd03ccbfd24303edaeb91ae6d413a59d69dbe0

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

data/lib/fluent/plugin/out_syslog_tls.rb

@@ -47,13 +47,11 @@ def can_write(host_ip_port)
 end
 
 def increase_retry(host_ip_port)
-  pp "1 :: increase_retry :: " + host_ip_port + " time :: " + Time.now.to_s
   if !conatins_host(host_ip_port)
     add_host_backoff_spec(0, host_ip_port)
   end
   begin
     $host_backoff_specs_list.each do |backoff_specs|
-      pp "1 :: increase_retry :: backoff_specs.hostIPport " + backoff_specs.hostIPport + " time :: " + Time.now.to_s
       if backoff_specs.hostIPport == host_ip_port
         backoff_specs.failtowrite
       end

data/lib/syslog_tls/host_backoff_specs.rb

@@ -18,14 +18,16 @@ module SyslogTls
         time_passed_since_failure = time_passed_since_failure.round(2)
       end
       if time_passed_since_failure == -1
-        pp "canwrite writting :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
         return 1
       end
-      if time_passed_since_failure > @baseThreshold ** @retriesToDo
+      backoffTime = @baseThreshold ** @retriesToDo
+      if backoffTime > 3600
+        backoffTime = 3600
+      end
+      if time_passed_since_failure > backoffTime
         pp "canwrite writting after backoff :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
         return 1
       else
-        pp "canwrite cannot write BACKINGOFFF :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
         return 0
       end
     end
@@ -33,7 +35,6 @@ module SyslogTls
     def failtowrite
       @retriesToDo += 1
       @failTime = Time.now
-      pp "failtowrite :: " + @retriesToDo.to_s + " time :: " + Time.now.to_s
     end
 
     def resetRetries

data/lib/syslog_tls/ssl_transport.rb

@@ -31,7 +31,6 @@ 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
@@ -46,23 +45,18 @@ module SyslogTls
 
     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
 
@@ -132,9 +126,7 @@ 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
@@ -143,7 +135,6 @@ module SyslogTls
         end
       end
       begin
-        pp "initialize SSLTransport.write !idle_timeout"
         retry_id ||= 0
         do_write(s)
       rescue => e
@@ -177,10 +168,7 @@ module SyslogTls
     end
 
     def select_with_timeout(tcp, type)
-
       host_ip_port = host + ":" + port.to_s
-      pp "1: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
-
       case type
       when :connect_read
         args = [[tcp], nil, nil, CONNECT_TIMEOUT]
@@ -194,24 +182,17 @@ module SyslogTls
         raise "Unknown select type #{type}"
       end
       if type.to_s == "connect_write"
-        pp "2: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
         if can_write(host_ip_port) == 1
-          pp "3: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
           io_select_return = IO.select(*args)
           ready_sockets, _, _ = io_select_return
-          pp "ready_sockets :: " + ready_sockets.to_s + " :: " + host_ip_port + " time :: " + Time.now.to_s
-          pp "io_select_return :: " + io_select_return.to_s + " :: " + host_ip_port + " time :: " + Time.now.to_s
           if !ready_sockets.empty?
-            pp "4: initialize SSLTransport.select_with_timeout :: " + host_ip_port + " time :: " + Time.now.to_s
             reset_tries(host_ip_port)
             io_select_return
           else
             increase_retry(host_ip_port)
-            pp "initialize SSLTransport.select_with_timeout :: Socket timeout" + " time :: " + Time.now.to_s
             io_select_return || raise("Socket timeout during #{type}")
           end
         else
-          pp "initialize SSLTransport.select_with_timeout :: Failed to write" + " time :: " + Time.now.to_s
           io_select_return || raise("Failed to write #{type}")
         end
       else

metadata

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