Skip to content

Commit

Permalink
RUBY-400 changed default op_timeout for ReplSetConnection from 30 sec…
Browse files Browse the repository at this point in the history
…onds to disabled
  • Loading branch information
TylerBrock committed Jan 21, 2012
1 parent f56846b commit a281724
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/mongo/repl_set_connection.rb
Expand Up @@ -51,7 +51,7 @@ class ReplSetConnection < Connection
# @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.
# 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
# connection attempt.
# @option opts [Boolean] :ssl (false) If true, create the connection to the server using SSL.
Expand Down Expand Up @@ -469,7 +469,7 @@ def setup(opts)
@pool_timeout = opts[:pool_timeout] || opts[:timeout] || 5.0

# Timeout on socket read operation.
@op_timeout = opts[:op_timeout] || 30
@op_timeout = opts[:op_timeout] || nil

# Timeout on socket connect.
@connect_timeout = opts[:connect_timeout] || 30
Expand Down

0 comments on commit a281724

Please sign in to comment.