Fix openssl error handling, #83

contribsys · Feb 14, 2024 · 88ee48c · 88ee48c
1 parent e163c28
commit 88ee48c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/faktory/client.rb b/lib/faktory/client.rb
@@ -56,6 +56,12 @@ def initialize(url: uri_from_env || "tcp://localhost:7419", debug: false, timeou
       @debug = debug
       @location = URI(url)
       @timeout = timeout
+      @errors = [SystemCallError, SocketError, TimeoutError]
+
+      if tls?
+        require "openssl"
+        @errors << OpenSSL::SSL::SSLError
+      end
 
       open_socket(@timeout)
     end
@@ -251,7 +257,6 @@ def tls?
     # NB: aliased by faktory/testing
     def open_socket(timeout = DEFAULT_TIMEOUT)
       if tls?
-        require "openssl"
         sock = TCPSocket.new(@location.hostname, @location.port)
         sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
 
@@ -321,7 +326,7 @@ def transaction
 
       begin
         yield
-      rescue SystemCallError, SocketError, TimeoutError, OpenSSL::SSL::SSLError
+      rescue *@errors
         if retryable
           retryable = false