Revert "SERVER-53423: Make ConnectString::connect return a status instead of setting error message"

This reverts commit ad1169d34cbd457a4d0637230e615bdf1d177531.

1 files changed, 10 insertions, 11 deletions

diff --git a/src/mongo/client/connpool.cpp b/src/mongo/client/connpool.cpp
index 946c5b8741d..e3a5a925636 100644
--- a/src/mongo/client/connpool.cpp
+++ b/src/mongo/client/connpool.cpp
@@ -389,12 +389,10 @@ DBClientBase* DBConnectionPool::_finishCreate(const string& ident,
 
 DBClientBase* DBConnectionPool::get(const ConnectionString& url, double socketTimeout) {
     auto connect = [&]() {
-        auto c = url.connect(StringData(), socketTimeout);
-        uassert(13328,
-                fmt::format(
-                    "{}: connect failed {} : {}", _name, url.toString(), c.getStatus().reason()),
-                c.isOK());
-        return c.getValue().release();
+        string errmsg;
+        auto c = url.connect(StringData(), errmsg, socketTimeout).release();
+        uassert(13328, _name + ": connect failed " + url.toString() + " : " + errmsg, c);
+        return c;
     };
 
     return Detail::get(this, url.toString(), socketTimeout, connect);
@@ -404,14 +402,15 @@ DBClientBase* DBConnectionPool::get(const string& host, double socketTimeout) {
     auto connect = [&] {
         const ConnectionString cs(uassertStatusOK(ConnectionString::parse(host)));
 
-        auto swConn = cs.connect(StringData(), socketTimeout);
-        if (!swConn.isOK()) {
+        string errmsg;
+        auto c = cs.connect(StringData(), errmsg, socketTimeout).release();
+        if (!c) {
             throwSocketError(SocketErrorKind::CONNECT_ERROR,
                              host,
-                             fmt::format("{} error: {}", _name, swConn.getStatus().reason()));
+                             str::stream() << _name << " error: " << errmsg);
         }
 
-        return swConn.getValue().release();
+        return c;
     };
 
     return Detail::get(this, host, socketTimeout, connect);
@@ -421,7 +420,7 @@ DBClientBase* DBConnectionPool::get(const MongoURI& uri, double socketTimeout) {
     auto connect = [&] {
         string errmsg;
         std::unique_ptr<DBClientBase> c(uri.connect(uri.getAppName().get(), errmsg, socketTimeout));
-        uassert(40356, fmt::format("{}: connect failed {} : {}", _name, uri.toString(), errmsg), c);
+        uassert(40356, _name + ": connect failed " + uri.toString() + " : " + errmsg, c);
         return c.release();
     };