wip

mongodb · Feb 9, 2024 · ba93e1e · ba93e1e
1 parent 908f150
commit ba93e1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/mongo/server/connection.rb b/lib/mongo/server/connection.rb
@@ -261,12 +261,10 @@ def connect!(context = nil)
           opts = ssl_options.merge(
             connection_address: address,
             connection_generation: generation,
-            pipe: options[:pipe]
-          ).tap do |o|
-            o[:connect_timeout]
-          end
-          address.socket(socket_timeout, ssl_options.merge(
-            connection_address: address, connection_generation: generation, pipe: options[:pipe]))
+            pipe: options[:pipe],
+            connect_timeout: context&.remaining_timeout_sec
+          )
+          address.socket(socket_timeout, opts)
         end
       end
 

diff --git a/lib/mongo/server/connection_pool.rb b/lib/mongo/server/connection_pool.rb
@@ -1260,7 +1260,7 @@ def get_connection(pid, connection_global_id)
       # @raise [ Timeout::Error ] If the connection pool is at maximum size
       #   and remains so for longer than the wait timeout.
       def retrieve_and_connect_connection(connection_global_id, context =  nil)
-        deadline = Utils.monotonic_time + wait_timeout(context.remaining_timeout_sec)
+        deadline = Utils.monotonic_time + wait_timeout(context&.remaining_timeout_sec)
         connection = nil
 
         @lock.synchronize do