Handle IO::TimeoutError when establishing connection (#993)

Since 6165b94, Dalli::Socket::TCP.open can also raise this error.
petergoldstein · Feb 12, 2024 · 23bc51f · 23bc51f
1 parent 4baeb34
commit 23bc51f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ Dalli Changelog
 Unreleased
 ==========
 
+ - Handle IO::TimeoutError when establishing connection (eugeneius)
+
 3.2.7
 ==========
 

diff --git a/lib/dalli/protocol/connection_manager.rb b/lib/dalli/protocol/connection_manager.rb
@@ -55,7 +55,7 @@ def establish_connection
         @sock = memcached_socket
         @pid = PIDCache.pid
         @request_in_progress = false
-      rescue SystemCallError, Timeout::Error, EOFError, SocketError => e
+      rescue SystemCallError, *TIMEOUT_ERRORS, EOFError, SocketError => e
         # SocketError = DNS resolution failure
         error_on_request!(e)
       end

diff --git a/test/integration/test_network.rb b/test/integration/test_network.rb
@@ -42,6 +42,13 @@
             end
           end
 
+          it 'handle socket timeouts' do
+            dc = Dalli::Client.new('localhost:19123', socket_timeout: 0)
+            assert_raises Dalli::RingError, message: 'No server available' do
+              dc.get('abc')
+            end
+          end
+
           it 'handle connect timeouts' do
             memcached_mock(lambda { |sock|
                              sleep(0.6)