Skip to content

Commit 30b722c

Browse files
Mikhail MontsevMikhail Montsev
Mikhail Montsev
and
Mikhail Montsev
authored
Throw exception instead of calling exit(1) in TBasicServicesInitializer (#11422)
Co-authored-by: Mikhail Montsev <[email protected]>
1 parent 3d0d6db commit 30b722c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ static TInterconnectSettings GetInterconnectSettings(const NKikimrConfig::TInter
446446
try {
447447
return TFileInput(*path).ReadAll();
448448
} catch (const std::exception& ex) {
449-
Cerr << "failed to read " << name << " file '" << *path << "': " << ex.what() << Endl;
450-
exit(1);
449+
ythrow yexception()
450+
<< "failed to read " << name << " file '" << *path << "': " << ex.what();
451451
}
452452
}
453453
return TString();
@@ -743,9 +743,9 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
743743
auto listener = new TInterconnectListenerTCP(
744744
address, node.second.second, icCommon);
745745
if (int err = listener->Bind()) {
746-
Cerr << "Failed to set up IC listener on port " << node.second.second
747-
<< " errno# " << err << " (" << strerror(err) << ")" << Endl;
748-
exit(1);
746+
ythrow yexception()
747+
<< "Failed to set up IC listener on port " << node.second.second
748+
<< " errno# " << err << " (" << strerror(err) << ")";
749749
}
750750
setup->LocalServices.emplace_back(MakeInterconnectListenerActorId(false), TActorSetupCmd(listener,
751751
TMailboxType::ReadAsFilled, interconnectPoolId));
@@ -763,9 +763,9 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
763763
}
764764
auto listener = new TInterconnectListenerTCP(address, info.GetPort(), icCommon);
765765
if (int err = listener->Bind()) {
766-
Cerr << "Failed to set up IC listener on port " << info.GetPort()
767-
<< " errno# " << err << " (" << strerror(err) << ")" << Endl;
768-
exit(1);
766+
ythrow yexception()
767+
<< "Failed to set up IC listener on port " << info.GetPort()
768+
<< " errno# " << err << " (" << strerror(err) << ")";
769769
}
770770
setup->LocalServices.emplace_back(MakeInterconnectListenerActorId(true), TActorSetupCmd(listener,
771771
TMailboxType::ReadAsFilled, interconnectPoolId));
@@ -779,9 +779,9 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
779779
icCommon->TechnicalSelfHostName = nodesManagerConfig.GetHost();
780780
auto listener = new TInterconnectListenerTCP({}, nodesManagerConfig.GetPort(), icCommon);
781781
if (int err = listener->Bind()) {
782-
Cerr << "Failed to set up IC listener on port " << nodesManagerConfig.GetPort()
783-
<< " errno# " << err << " (" << strerror(err) << ")" << Endl;
784-
exit(1);
782+
ythrow yexception()
783+
<< "Failed to set up IC listener on port " << nodesManagerConfig.GetPort()
784+
<< " errno# " << err << " (" << strerror(err) << ")";
785785
}
786786
setup->LocalServices.emplace_back(MakeInterconnectListenerActorId(true), TActorSetupCmd(listener,
787787
TMailboxType::ReadAsFilled, interconnectPoolId));

0 commit comments

Comments
 (0)