diff options
author | uzhas <uzhas@yandex-team.ru> | 2022-02-28 13:51:51 +0300 |
---|---|---|
committer | uzhas <uzhas@yandex-team.ru> | 2022-02-28 13:51:51 +0300 |
commit | 8f501975be57fbf2dab6881d62c3dfefde562a90 (patch) | |
tree | ab387a28d3882d49445c83edcc526d8a56603a1f | |
parent | 07360d00c60ae875099da62554f3b7009f1598b1 (diff) | |
download | ydb-8f501975be57fbf2dab6881d62c3dfefde562a90.tar.gz |
YQ-884: simplify code
ref:dd05920b30e59878704712c9000dfc748c7b7724
-rw-r--r-- | ydb/core/grpc_services/grpc_request_proxy_simple.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ydb/core/grpc_services/grpc_request_proxy_simple.cpp b/ydb/core/grpc_services/grpc_request_proxy_simple.cpp index ec6893b7442..1289da317cb 100644 --- a/ydb/core/grpc_services/grpc_request_proxy_simple.cpp +++ b/ydb/core/grpc_services/grpc_request_proxy_simple.cpp @@ -26,8 +26,7 @@ TString InferPublicHostFromServerHost(const TString& serverHost) { return serverHost && serverHost != "[::]" ? serverHost : FQDNHostName(); } -template <typename T> -void AddEndpointsForGrpcConfig(const T& grpcConfig, Ydb::Discovery::ListEndpointsResult& result) { +void AddEndpointsForGrpcConfig(const NKikimrConfig::TGRpcConfig& grpcConfig, Ydb::Discovery::ListEndpointsResult& result) { const TString& address = InferPublicHostFromServerHost(grpcConfig.GetHost()); if (const ui32 port = grpcConfig.GetPort()) { FillEnpointInfo(address, port, grpcConfig.GetPublicHost(), grpcConfig.GetPublicPort(), false, *result.add_endpoints()); @@ -70,18 +69,19 @@ private: const auto issue = MakeIssue(NKikimrIssues::TIssuesIds::YDB_API_VALIDATION_ERROR, validationError); requestBaseCtx->RaiseIssue(issue); requestBaseCtx->ReplyWithYdbStatus(Ydb::StatusIds::BAD_REQUEST); - } else { - THolder<TEvListEndpointsRequest> request(event->Release().Release()); - auto *result = TEvListEndpointsRequest::AllocateResult<Ydb::Discovery::ListEndpointsResult>(request); - const auto& grpcConfig = AppConfig.GetGRpcConfig(); - AddEndpointsForGrpcConfig(grpcConfig, *result); + return; + } - for (const auto& externalEndpoint : grpcConfig.GetExtEndpoints()) { - AddEndpointsForGrpcConfig(externalEndpoint, *result); - } + THolder<TEvListEndpointsRequest> request(event->Release().Release()); + auto *result = TEvListEndpointsRequest::AllocateResult<Ydb::Discovery::ListEndpointsResult>(request); + const auto& grpcConfig = AppConfig.GetGRpcConfig(); + AddEndpointsForGrpcConfig(grpcConfig, *result); - request->SendResult(*result, Ydb::StatusIds::SUCCESS); + for (const auto& externalEndpoint : grpcConfig.GetExtEndpoints()) { + AddEndpointsForGrpcConfig(externalEndpoint, *result); } + + request->SendResult(*result, Ydb::StatusIds::SUCCESS); } void Handle(TEvProxyRuntimeEvent::TPtr& event, const TActorContext&) { |