Revert dynamic rescue, Ruby is savvy enough to handle this

contribsys · Feb 15, 2024 · 53cfe89 · 53cfe89
1 parent e681a8d
commit 53cfe89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,10 @@
 # Changes
 
+## 2.1.0
+
+- Improve support for TLS connections [#84]
+- Gracefully handle OpenSSL errors during transactions [#83]
+
 ## 2.0.0
 
 - Allow more connections in pool [#455]

diff --git a/lib/faktory/client.rb b/lib/faktory/client.rb
@@ -56,12 +56,6 @@ 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
@@ -257,6 +251,7 @@ 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)
 
@@ -335,7 +330,7 @@ def transaction
 
       begin
         yield
-      rescue *@errors
+      rescue SystemCallError, SocketError, TimeoutError, OpenSSL::SSL::SSLError
         if retryable
           retryable = false