remote_syslog_sender 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05d03966e485764b3f9a76b96a15d5bd3ed63185
-  data.tar.gz: a0781e58be56ae8206b93e9c60f7fe9bef5654bd
+  metadata.gz: c16108731d2d7b6e31e5af7c7ece9e4eeee102f8
+  data.tar.gz: 486189b1bb483e7febc18cc678f7a95c7df589a4
 SHA512:
-  metadata.gz: 4086fc64db33dc77af8eddc63c17822440ef83ef82b14cd2131ca424b9e40c57c86caca741e561aed41defbbef36d8952ab5c6dfdbfcce43888ab44bc5ab92a1
-  data.tar.gz: 15ca1c0a228a16b1480bf5eeb1763487f5f0be02e998a5e454a0e24e9f92893851a501fde875237ef168e47d43a4f2bd0917e5510f6c94954bd16c9dea509d13
+  metadata.gz: 1decdb20cd350dd7bb3c5b25a1b0082479ec065854e1ffa9aa80f35658d766657ea0709d2ce4032f5ce69c2ec185606ada0079e09ecc5c1d4c80a85b3a9c85f6
+  data.tar.gz: e74dd3847e4ecb0cb63c77238d3fff45aec2798213e679c991c895a95ae21ce7fe28163569e89fc2f3fc331825e768b2c17cd3edc690522860ef5b80a3b0803e

data/lib/remote_syslog_sender/tcp_sender.rb

@@ -16,9 +16,10 @@ module RemoteSyslogSender
       @ssl_method      = options[:ssl_method] || 'TLSv1_2'
       @ca_file         = options[:ca_file]
       @verify_mode     = options[:verify_mode]
-      @timeout         = options[:timeout]
+      @timeout         = options[:timeout] || 600
       @timeout_exception   = !!options[:timeout_exception]
       @exponential_backoff = !!options[:exponential_backoff]
+      @connect_mutex = Mutex.new
 
       if [:SOL_SOCKET, :SO_KEEPALIVE, :IPPROTO_TCP, :TCP_KEEPIDLE].all? {|c| Socket.const_defined? c}
         @keep_alive      = options[:keep_alive]
@@ -44,40 +45,40 @@ module RemoteSyslogSender
 
     def connect
       connect_retry_count = 0
-      connect_retry_limit = 2
+      connect_retry_limit = 3
       connect_retry_interval = 1
-      begin
-        sock = TCPSocket.new(@remote_hostname, @remote_port)
-
-        if @keep_alive
-          sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
-          sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE, @keep_alive_idle) if @keep_alive_idle
-          sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT, @keep_alive_cnt) if @keep_alive_cnt
-          sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL, @keep_alive_intvl) if @keep_alive_intvl
-        end
-        if @tls
-          require 'openssl'
-          context = OpenSSL::SSL::SSLContext.new(@ssl_method)
-          context.ca_file = @ca_file if @ca_file
-          context.verify_mode = @verify_mode if @verify_mode
-
-          @tcp_socket = sock
-          @socket = OpenSSL::SSL::SSLSocket.new(sock, context)
-          @socket.connect
-          @socket.post_connection_check(@remote_hostname)
-          raise "test" if connect_retry_count < 1
-          raise "verification error" if @socket.verify_result != OpenSSL::X509::V_OK
-        else
-          @socket = sock
-        end
-      rescue => e
-        close
-        if connect_retry_count < connect_retry_limit
-          sleep connect_retry_interval
-          connect_retry_count += 1
-          retry
-        else
-          raise
+      @connect_mutex.synchronize do
+        begin
+          @tcp_socket = TCPSocket.new(@remote_hostname, @remote_port)
+
+          if @keep_alive
+            @tcp_socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
+            @tcp_socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE, @keep_alive_idle) if @keep_alive_idle
+            @tcp_socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT, @keep_alive_cnt) if @keep_alive_cnt
+            @tcp_socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL, @keep_alive_intvl) if @keep_alive_intvl
+          end
+          if @tls
+            require 'openssl'
+            context = OpenSSL::SSL::SSLContext.new(@ssl_method)
+            context.ca_file = @ca_file if @ca_file
+            context.verify_mode = @verify_mode if @verify_mode
+
+            @socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket, context)
+            @socket.connect
+            @socket.post_connection_check(@remote_hostname)
+            raise "verification error" if @socket.verify_result != OpenSSL::X509::V_OK
+          else
+            @socket = @tcp_socket
+          end
+        rescue
+          close
+          if connect_retry_count < connect_retry_limit
+            sleep connect_retry_interval
+            connect_retry_count += 1
+            retry
+          else
+            raise
+          end
         end
       end
     end
@@ -103,6 +104,12 @@ module RemoteSyslogSender
           result = @socket.__send__(method, payload)
           payload_size -= result
           payload.slice!(0, result) if payload_size > 0
+        rescue IO::WaitReadable
+          timeout_wait = @timeout - (get_time - start)
+          retry if IO.select([@socket], nil, nil, timeout_wait)
+
+          raise NonBlockingTimeout if @timeout_exception
+          break
         rescue IO::WaitWritable
           timeout_wait = @timeout - (get_time - start)
           retry if IO.select(nil, [@socket], nil, timeout_wait)

data/remote_syslog_sender.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'remote_syslog_sender'
-  s.version           = '1.1.3'
+  s.version           = '1.1.4'
   s.summary     = "Message sender that sends directly to a remote syslog endpoint"
   s.description = "Message sender that sends directly to a remote syslog endpoint (Support UDP, TCP, TCP+TLS)"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_syslog_sender
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Tomohiro Hashidate