remote_syslog_sender 1.1.2 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ca5b6ec6c42fc7554d4d3318c6f267d1a3f8a508
-  data.tar.gz: cdb652566a198fa60e5a54487e4ea8e371c07011
+SHA256:
+  metadata.gz: 5f790e1aed9473d0578f52ec35947fd78d1ab614670513efe787ec79ac4cf42b
+  data.tar.gz: f65e0ced0294ecbe1533fe04a4b2054e9f976230e74fd813ca30733dd2fbea9e
 SHA512:
-  metadata.gz: d8fe3ae5a16f8695e96cde2d60166013ab09037e8a4e671217123aa1cee487b7d170c84b814b43a2fd4f476d05502d4e807099fb12875278c6b39d8acaed0bdf
-  data.tar.gz: 5ad178f44071790a783d33869c578c3a02218a6200d805c2cce3558a431375fcef924f1bdb2193eb26ffe5ce56355b8283c874faf29a946cf0927b8c21d631e6
+  metadata.gz: ef23aa24b79470f4c0e5fb51be9b90e1801c1513b85494d7d63facd4abc47fc109f4e5a34366b96eaf45c729895a904f8767da718e53676a734e723c1ebd8720
+  data.tar.gz: 4128b921473bf397d423a08f99895a3e2d77a7c1dc158b9e9c8b3b2f85fe85b34bc983a18fbaaf1b492d0ecb8946d24853974659b90cc8af7569f114bbba69c1

data/README.md

@@ -1,6 +1,6 @@
 # Remote Syslog Sender
 
-This gem is syslog sender that is extracted from (papertrail/remote_syslog_logger)[https://github.com/papertrail/remote_syslog_logger]
+This gem is syslog sender that is extracted from [papertrail/remote_syslog_logger](https://github.com/papertrail/remote_syslog_logger)
 
 This can send message to remote syslog server via UDP, TCP, TCP+TLS.
 (Original does not support TCP, TCP+TLS protocol).

data/lib/remote_syslog_sender/sender.rb

@@ -48,8 +48,11 @@ module RemoteSyslogSender
           packet.content = line
           send_msg(packet.assemble(@packet_size))
         rescue
-          $stderr.puts "#{self.class} error: #{$!.class}: #{$!}\nOriginal message: #{line}"
-          raise if @whinyerrors
+          if @whinyerrors
+            raise
+          else
+            $stderr.puts "#{self.class} error: #{$!.class}: #{$!}\nOriginal message: #{line}"
+          end
         end
       end
     end

data/lib/remote_syslog_sender/tcp_sender.rb

@@ -16,10 +16,13 @@ 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]
 
+      @mutex = Mutex.new
+      @tcp_socket = nil
+
       if [:SOL_SOCKET, :SO_KEEPALIVE, :IPPROTO_TCP, :TCP_KEEPIDLE].all? {|c| Socket.const_defined? c}
         @keep_alive      = options[:keep_alive]
       end
@@ -35,27 +38,53 @@ 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 = 3
+      connect_retry_interval = 1
+      @mutex.synchronize do
+        begin
+          close
+
+          @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
+            if @verify_mode != OpenSSL::SSL::VERIFY_NONE
+              @socket.post_connection_check(@remote_hostname)
+              raise "verification error" if @socket.verify_result != OpenSSL::X509::V_OK
+            end
+          else
+            @socket = @tcp_socket
+          end
+        rescue
+          if connect_retry_count < connect_retry_limit
+            sleep connect_retry_interval
+            connect_retry_count += 1
+            retry
+          else
+            raise
+          end
+        end
       end
     end
 
@@ -77,9 +106,15 @@ module RemoteSyslogSender
       until payload_size <= 0
         start = get_time
         begin
-          result = @socket.__send__(method, payload)
+          result = @mutex.synchronize { @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.2'
+  s.version           = '1.2.2'
   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)"
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'syslog_protocol'
 
-  s.add_development_dependency "bundler", "~> 1.6"
+  s.add_development_dependency "bundler", ">= 1.6", "< 3.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "test-unit"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: remote_syslog_sender
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.2
 platform: ruby
 authors:
 - Tomohiro Hashidate
 - Eric Lindvall
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syslog_protocol
@@ -29,16 +29,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +95,7 @@ files:
 homepage: https://github.com/reproio/remote_syslog_logger
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,9 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Message sender that sends directly to a remote syslog endpoint
 test_files: