diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2012-06-05 19:50:36 +0200 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2012-06-05 19:50:36 +0200 |
| commit | 291c9687fb2307dc22d1f269eb4d0aa98fe8cadc (patch) | |
| tree | f46fac7bf8530d100aa55da89dfaa53490fbb350 /db/repl.cpp | |
| parent | 6d0f215499dda50fdba4a6f60ab359efe0054e0d (diff) | |
| parent | 3703a282eca7e79e91f4bd651b1b861b76dc6c68 (diff) | |
| download | mongodb-291c9687fb2307dc22d1f269eb4d0aa98fe8cadc.tar.gz | |
Merge tag 'upstream/2.0.6'
Upstream version 2.0.6
Diffstat (limited to 'db/repl.cpp')
| -rw-r--r-- | db/repl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/repl.cpp b/db/repl.cpp index 5edf0c2..8dcdd13 100644 --- a/db/repl.cpp +++ b/db/repl.cpp @@ -1115,7 +1115,7 @@ namespace mongo { bool OplogReader::commonConnect(const string& hostName) { if( conn() == 0 ) { - _conn = shared_ptr<DBClientConnection>(new DBClientConnection( false, 0, 0 /* tcp timeout */)); + _conn = shared_ptr<DBClientConnection>(new DBClientConnection( false, 0, 60*10 /* tcp timeout */)); string errmsg; ReplInfo r("trying to connect to sync source"); if ( !_conn->connect(hostName.c_str(), errmsg) || |