Skip to content

Commit aa05f8c

Browse files
p-mongop
andauthored
Fix MONGOID-5139 mongoid.yml template socket timeout default is incorrect (#5296)
Co-authored-by: Oleg Pudeyev <[email protected]>
1 parent 06beda9 commit aa05f8c

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

docs/reference/configuration.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,13 @@ for details on driver options.
220220
# (default: 10)
221221
connect_timeout: 10
222222

223-
# The timeout to wait to execute operations on a socket before raising an error.
224-
# (default: nil)
223+
# How long to wait for a response for each operation sent to the
224+
# server. This timeout should be set to a value larger than the
225+
# processing time for the longest operation that will be executed
226+
# by the application. Note that this is a client-side timeout;
227+
# the server may continue executing an operation after the client
228+
# aborts it with the SocketTimeout exception.
229+
# (default: nil, meaning no timeout)
225230
socket_timeout: 5
226231

227232
# The name of the replica set to connect to. Servers provided as seeds that do

lib/rails/generators/mongoid/config/templates/mongoid.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,13 @@ development:
8080
# (default: 10)
8181
# connect_timeout: 10
8282

83-
# The timeout to wait to execute operations on a socket before raising an error.
84-
# (default: 5)
83+
# How long to wait for a response for each operation sent to the
84+
# server. This timeout should be set to a value larger than the
85+
# processing time for the longest operation that will be executed
86+
# by the application. Note that this is a client-side timeout;
87+
# the server may continue executing an operation after the client
88+
# aborts it with the SocketTimeout exception.
89+
# (default: nil, meaning no timeout)
8590
# socket_timeout: 5
8691

8792
# The name of the replica set to connect to. Servers provided as seeds that do

0 commit comments

Comments
 (0)