RUBY-400 changed default op_timeout for ReplSetConnection from 30 seconds to disabled

This commit is contained in:
Tyler Brock 2012-01-20 19:12:24 -05:00
parent f56846b444
commit a2817247ac
1 changed files with 2 additions and 2 deletions

View File

@ -51,7 +51,7 @@ module Mongo
# @option options [Float] :pool_timeout (5.0) When all of the connections a pool are checked out, # @option options [Float] :pool_timeout (5.0) When all of the connections a pool are checked out,
# this is the number of seconds to wait for a new connection to be released before throwing an exception. # this is the number of seconds to wait for a new connection to be released before throwing an exception.
# Note: this setting is relevant only for multi-threaded applications. # Note: this setting is relevant only for multi-threaded applications.
# @option opts [Float] :op_timeout (30) The number of seconds to wait for a read operation to time out. # @option opts [Float] :op_timeout (nil) The number of seconds to wait for a read operation to time out.
# @option opts [Float] :connect_timeout (30) The number of seconds to wait before timing out a # @option opts [Float] :connect_timeout (30) The number of seconds to wait before timing out a
# connection attempt. # connection attempt.
# @option opts [Boolean] :ssl (false) If true, create the connection to the server using SSL. # @option opts [Boolean] :ssl (false) If true, create the connection to the server using SSL.
@ -469,7 +469,7 @@ module Mongo
@pool_timeout = opts[:pool_timeout] || opts[:timeout] || 5.0 @pool_timeout = opts[:pool_timeout] || opts[:timeout] || 5.0
# Timeout on socket read operation. # Timeout on socket read operation.
@op_timeout = opts[:op_timeout] || 30 @op_timeout = opts[:op_timeout] || nil
# Timeout on socket connect. # Timeout on socket connect.
@connect_timeout = opts[:connect_timeout] || 30 @connect_timeout = opts[:connect_timeout] || 30