diff options
author | Reo Kimura <reo.kimura@mongodb.com> | 2020-07-22 03:03:43 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-11-17 01:16:21 +0000 |
commit | ab0703b3c6ad1607fa224c5be2b893ddbdad365e (patch) | |
tree | 7368863c9e82869c5e91096de3017a10c26294c8 /src/mongo/tools | |
parent | 96ced1dddcb87b0bc7bafc40094d9014c04edd98 (diff) | |
download | mongo-ab0703b3c6ad1607fa224c5be2b893ddbdad365e.tar.gz |
SERVER-49072 Make ServiceExecutors into Decorations
Diffstat (limited to 'src/mongo/tools')
-rw-r--r-- | src/mongo/tools/bridge.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/mongo/tools/bridge.cpp b/src/mongo/tools/bridge.cpp index 986114093ed..1c2f7d46bc9 100644 --- a/src/mongo/tools/bridge.cpp +++ b/src/mongo/tools/bridge.cpp @@ -485,10 +485,9 @@ int bridgeMain(int argc, char** argv) { setGlobalServiceContext(ServiceContext::make()); auto serviceContext = getGlobalServiceContext(); serviceContext->setServiceEntryPoint(std::make_unique<ServiceEntryPointBridge>(serviceContext)); - serviceContext->setServiceExecutor( - std::make_unique<transport::ServiceExecutorSynchronous>(serviceContext)); - - fassert(50766, serviceContext->getServiceExecutor()->start()); + if (auto status = serviceContext->getServiceEntryPoint()->start(); !status.isOK()) { + LOGV2(4907203, "Error starting service entry point", "error"_attr = status); + } transport::TransportLayerASIO::Options opts; opts.ipList.emplace_back("0.0.0.0"); @@ -497,13 +496,13 @@ int bridgeMain(int argc, char** argv) { serviceContext->setTransportLayer(std::make_unique<mongo::transport::TransportLayerASIO>( opts, serviceContext->getServiceEntryPoint())); auto tl = serviceContext->getTransportLayer(); - if (!tl->setup().isOK()) { - LOGV2(22922, "Error setting up transport layer"); + if (auto status = tl->setup(); !status.isOK()) { + LOGV2(22922, "Error setting up transport layer", "error"_attr = status); return EXIT_NET_ERROR; } - if (!tl->start().isOK()) { - LOGV2(22923, "Error starting transport layer"); + if (auto status = tl->start(); !status.isOK()) { + LOGV2(22923, "Error starting transport layer", "error"_attr = status); return EXIT_NET_ERROR; } |