summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsamantharitter <samantha.ritter@10gen.com>2016-12-12 14:24:37 -0500
committersamantharitter <samantha.ritter@10gen.com>2016-12-12 14:24:44 -0500
commit31a63abcc9ce6fe58922f3ef789dd9a92968bb3e (patch)
treef939221224599354024a6cb7c4dbb96aa8bb193b
parent80775cd49db61ec792313da630158a2904faa75f (diff)
downloadmongo-31a63abcc9ce6fe58922f3ef789dd9a92968bb3e.tar.gz
SERVER-27358 Convert socket timeout to milliseconds to use in connect
(not cherry-picked)
-rw-r--r--src/mongo/util/net/sock.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
index e2bbc28da83..ad41d453c0c 100644
--- a/src/mongo/util/net/sock.cpp
+++ b/src/mongo/util/net/sock.cpp
@@ -589,7 +589,7 @@ bool Socket::connect(SockAddr& remote) {
}
const uint64_t connectTimeoutMillis =
- _timeout > 0 ? std::min(kMaxConnectTimeoutMS, _timeout) : kMaxConnectTimeoutMS;
+ _timeout > 0 ? std::min(kMaxConnectTimeoutMS, (_timeout * 1000)) : kMaxConnectTimeoutMS;
const uint64_t expiration = curTimeMillis64() + connectTimeoutMillis;
bool connectSucceeded = ::connect(_fd, _remote.raw(), _remote.addressSize) == 0;