riemann-client 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ecf7fbb122c865afd7a238b0431fa0e7612911bd144c245ede6e1b4bba7d315
-  data.tar.gz: ba917bc1d701fc4879b5273fb0b719271c39a0a9aca442d300f6e2864829f955
+  metadata.gz: 4d1995b06fc640ef8e66c806a1d89d59dfa58238c11049310255bf542121a4ea
+  data.tar.gz: dccb036f711cc73847cd81104756cd2d8b52fd9a5aa67c0528bd721a040ab504
 SHA512:
-  metadata.gz: 6b0ee1e832110bd39c4caf6fe16af86691dea30e77768789bfd3db23ddb5ddf1e0b9786a5c326586526e8ccf9da40d4b1168378b701ab97f36a92c7ea71e2eb4
-  data.tar.gz: 82e370d71c95d39530b3b1fc4725b6a4f9ece4348cbe6cce08d944bf6c3e72b6cd9ccea47e243ed307c989f44ddb12ad03b5abc8837f81ce8b0915fbf2236665
+  metadata.gz: 3079702426c293a96a1e07b38ccffb281a53ab31ca653bfb5dcf2952a0a53c5e714b55e92d42ba28bb0cfff0b97bf472a2eb319dc90a12350f72273e4954bd09
+  data.tar.gz: 46c21db177b2d22c61bd82bfd94b62321b54c893a596f37daf9f8e1e9297a02689784d3637a8be54cd0d9b4dd4f9f7e21a10c91d1e5232fe001b84d984173c8f

data/.github/dependabot.yml

@@ -5,7 +5,14 @@
 
 version: 2
 updates:
+  # Open PR for gem updates
   - package-ecosystem: "bundler" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+
+  # Open PR for GitHub Actions updates
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v1.2.1](https://github.com/riemann/riemann-ruby-client/tree/v1.2.1) (2023-07-30)
+
+[Full Changelog](https://github.com/riemann/riemann-ruby-client/compare/v1.2.0...v1.2.1)
+
+**Fixed bugs:**
+
+- Fix sending large batch of events over TLS [\#51](https://github.com/riemann/riemann-ruby-client/pull/51) ([smortex](https://github.com/smortex))
+
 ## [v1.2.0](https://github.com/riemann/riemann-ruby-client/tree/v1.2.0) (2023-06-28)
 
 [Full Changelog](https://github.com/riemann/riemann-ruby-client/compare/v1.1.0...v1.2.0)

data/lib/riemann/client/ssl_socket.rb

@@ -53,40 +53,6 @@ module Riemann
         end
         ssl_socket
       end
-
-      # Internal: Read up to a maxlen of data from the socket and store it in outbuf
-      #
-      # maxlen - the maximum number of bytes to read from the socket
-      # outbuf - the buffer in which to store the bytes.
-      #
-      # Returns the bytes read
-      def readpartial(maxlen, outbuf = nil)
-        super(maxlen, outbuf)
-      rescue OpenSSL::SSL::SSLErrorWaitReadable
-        unless wait_readable(read_timeout)
-          raise Timeout, "Could not read from #{host}:#{port} in #{read_timeout} seconds"
-        end
-
-        retry
-      end
-
-      # Internal: Write the given data to the socket
-      #
-      # buf - the data to write to the socket.
-      #
-      # Raises an error if it is unable to write the data to the socket within the
-      # write_timeout.
-      #
-      # returns nothing
-      def write(buf)
-        super(buf)
-      rescue OpenSSL::SSL::SSLErrorWaitWritable
-        unless wait_writable(write_timeout)
-          raise Timeout, "Could not write to #{host}:#{port} in #{write_timeout} seconds"
-        end
-
-        retry
-      end
     end
   end
 end

data/lib/riemann/client/tcp_socket.rb

@@ -311,7 +311,7 @@ module Riemann
       # Returns the bytes read
       def readpartial(maxlen, outbuf = nil)
         socket.read_nonblock(maxlen, outbuf)
-      rescue Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::ECONNRESET
+      rescue Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::ECONNRESET, IO::WaitReadable
         unless wait_readable(read_timeout)
           raise Timeout, "Could not read from #{host}:#{port} in #{read_timeout} seconds"
         end
@@ -332,11 +332,19 @@ module Riemann
           written = socket.write_nonblock(buf)
           buf = buf[written, buf.length]
         end
-      rescue Errno::EWOULDBLOCK, Errno::EINTR, Errno::EAGAIN, Errno::ECONNRESET
+      rescue Errno::EWOULDBLOCK, Errno::EINTR, Errno::EAGAIN, Errno::ECONNRESET, IO::WaitWritable
         unless wait_writable(write_timeout)
           raise Timeout, "Could not write to #{host}:#{port} in #{write_timeout} seconds"
         end
 
+        retry
+      rescue IO::WaitReadable
+        # Also rescued for SSL renegotiation in OpenSSL::SSL::SSLSocket according to
+        # https://ruby-doc.org/core-2.7.1/IO.html#method-c-select
+        unless wait_readable(read_timeout)
+          raise Timeout, "Could not write to #{host}:#{port} in #{write_timeout} seconds"
+        end
+
         retry
       end
 

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Riemann
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Kyle Kingsbury
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,7 +149,7 @@ homepage: https://github.com/aphyr/riemann-ruby-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.4.15
+signing_key:
 specification_version: 4
 summary: Client for the distributed event system Riemann.
 test_files: