diff options
author | Andrew Morrow <acm@mongodb.com> | 2017-06-28 22:18:04 -0400 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2017-07-05 13:44:03 -0400 |
commit | 477a40cc79c11ac18839997daf4301c2e4c748b1 (patch) | |
tree | 11adda42b6626f3c5b62828036735f9205193c50 /src/mongo/client/dbclient.cpp | |
parent | 7ef55bff9aaf6f75fd6dc2a71c8df9ebae25053a (diff) | |
download | mongo-477a40cc79c11ac18839997daf4301c2e4c748b1.tar.gz |
SERVER-27198 Remove ASIO based MessagingPort implementation
Also, consolidate the libraries in util/net, as they don't seem
to need to be separate.
Diffstat (limited to 'src/mongo/client/dbclient.cpp')
-rw-r--r-- | src/mongo/client/dbclient.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mongo/client/dbclient.cpp b/src/mongo/client/dbclient.cpp index 1e4d3240714..c8ed8838994 100644 --- a/src/mongo/client/dbclient.cpp +++ b/src/mongo/client/dbclient.cpp @@ -65,9 +65,7 @@ #include "mongo/util/concurrency/mutex.h" #include "mongo/util/debug_util.h" #include "mongo/util/log.h" -#include "mongo/util/net/asio_message_port.h" #include "mongo/util/net/message_port.h" -#include "mongo/util/net/message_port_startup_param.h" #include "mongo/util/net/socket_exception.h" #include "mongo/util/net/ssl_manager.h" #include "mongo/util/net/ssl_options.h" @@ -837,14 +835,7 @@ Status DBClientConnection::connectSocketOnly(const HostAndPort& serverAddress) { << ", address is invalid"); } - if (isMessagePortImplASIO()) { - // `_so_timeout` is in seconds. - auto ms = representAs<int64_t>(std::floor(_so_timeout * 1000)).value_or(kMaxMillisCount); - _port.reset(new ASIOMessagingPort( - ms > kMaxMillisCount ? Milliseconds::max() : Milliseconds(ms), _logLevel)); - } else { - _port.reset(new MessagingPort(_so_timeout, _logLevel)); - } + _port.reset(new MessagingPort(_so_timeout, _logLevel)); if (serverAddress.host().empty()) { return Status(ErrorCodes::InvalidOptions, |