remote_syslog_sender 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca5b6ec6c42fc7554d4d3318c6f267d1a3f8a508
-  data.tar.gz: cdb652566a198fa60e5a54487e4ea8e371c07011
+  metadata.gz: 05d03966e485764b3f9a76b96a15d5bd3ed63185
+  data.tar.gz: a0781e58be56ae8206b93e9c60f7fe9bef5654bd
 SHA512:
-  metadata.gz: d8fe3ae5a16f8695e96cde2d60166013ab09037e8a4e671217123aa1cee487b7d170c84b814b43a2fd4f476d05502d4e807099fb12875278c6b39d8acaed0bdf
-  data.tar.gz: 5ad178f44071790a783d33869c578c3a02218a6200d805c2cce3558a431375fcef924f1bdb2193eb26ffe5ce56355b8283c874faf29a946cf0927b8c21d631e6
+  metadata.gz: 4086fc64db33dc77af8eddc63c17822440ef83ef82b14cd2131ca424b9e40c57c86caca741e561aed41defbbef36d8952ab5c6dfdbfcce43888ab44bc5ab92a1
+  data.tar.gz: 15ca1c0a228a16b1480bf5eeb1763487f5f0be02e998a5e454a0e24e9f92893851a501fde875237ef168e47d43a4f2bd0917e5510f6c94954bd16c9dea509d13

data/lib/remote_syslog_sender/tcp_sender.rb

@@ -35,27 +35,50 @@ module RemoteSyslogSender
       connect
     end
 
+    def close
+      @socket.close if @socket
+      @tcp_socket.close if @tcp_socket
+    end
+
     private
 
     def connect
-      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
-        @socket = OpenSSL::SSL::SSLSocket.new(sock, context)
-        @socket.connect
-        @socket.post_connection_check(@remote_hostname)
-        raise "verification error" if @socket.verify_result != OpenSSL::X509::V_OK
-      else
-        @socket = sock
+      connect_retry_count = 0
+      connect_retry_limit = 2
+      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
+        end
       end
     end
 

data/remote_syslog_sender.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'remote_syslog_sender'
-  s.version           = '1.1.2'
+  s.version           = '1.1.3'
   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.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Tomohiro Hashidate