dalli-elasticache 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da71566964e9f17cacf29d2c670d15d7adb80e4b4cc86f8371ea98eb2b80928
-  data.tar.gz: 7b58a9dc5efb77773c0da4de9b1891bbdc5c98d8d4012e13fd432a7906ea6e16
+  metadata.gz: c0afff12dcbecd681d00446e7a792cb82f356f28e02bfaac78a1962180e7973e
+  data.tar.gz: 2918dfeefec59bf0c663c15ecc2d981a1b16a51d8b653d2df710290f379945f8
 SHA512:
-  metadata.gz: 04cf01bc3a0ff7c14c3173b05be796038bbe3ad45292bffdacb95834900bd8c40ecd224c206f676f3bdfde2e256beb3812d73b156723235daeabace027de704d
-  data.tar.gz: 13668d4ead1f6e6fd5e2288d5124a1cb47751d7f97dd4a2f50f288c3db123a7c2228d88b4264ea499091e9ebe0fd1db4167b71cd0b8ba8224793847f6dc4f94a
+  metadata.gz: 0acf68cd09b9bf0bda5e1e77a4c8aff7925edf1e1a51e26adf8773e7a86df0e69fdf9d285d6ee965b24648d0feeb6406cb9bfca6a1187f7ffb652ab117b275fc
+  data.tar.gz: 05702c86d429beea0759bde3682068986b7b0da1f54c55155e3b9ce2f228e95d9b979c8c8ffdf8a35e1a2b752a3e3523624aa8940454f073fd2c6cb79311f1b5

data/lib/dalli/elasticache/auto_discovery/base_command.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'openssl'
+require 'timeout'
 
 module Dalli
   module Elasticache
@@ -33,21 +34,32 @@ module Dalli
           end
         end
 
+        # `timeout` bounds the entire multi-line read as a single wall-clock deadline,
+        # not each individual `readline`. A per-line readiness check (e.g. `wait_readable`)
+        # can't tell buffered-but-unread bytes apart from an empty socket once a buffering
+        # layer (Ruby's IO buffer, or OpenSSL::Buffering for TLS) sits between the fd and
+        # `readline`, so it can't be used to gate individual lines reliably.
         def response_from_socket(socket)
+          return read_lines(socket) unless timeout
+
+          Timeout.timeout(timeout, Timeout::Error, "Auto discovery read timed out after #{timeout}s") do
+            read_lines(socket)
+          end
+        end
+
+        private
+
+        def read_lines(socket)
           data = +''
           loop do
-            wait_for_data(socket)
             line = socket.readline
             break if line.include?('END')
 
             data << line
           end
-
           data
         end
 
-        private
-
         def wrap_with_ssl(tcp_socket)
           ssl_socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, ssl_context)
           ssl_socket.hostname = @host
@@ -55,12 +67,6 @@ module Dalli
           ssl_socket.connect
           ssl_socket
         end
-
-        def wait_for_data(socket)
-          return unless timeout
-
-          raise Timeout::Error, "Auto discovery read timed out after #{timeout}s" unless socket.wait_readable(timeout)
-        end
       end
     end
   end

data/lib/dalli/elasticache/version.rb

@@ -2,6 +2,6 @@
 
 module Dalli
   class ElastiCache
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli-elasticache
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Aaron Suggs
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Configure Dalli clients with ElastiCache's AutoDiscovery
 test_files: []