Skip to content

Commit 2f33cfe

Browse files
authored
Update base.py revert grpc_port changes (#14745)
1 parent d1f5b91 commit 2f33cfe

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

ydb/tools/cfg/base.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -709,12 +709,7 @@ def default_log_level(self):
709709

710710
@property
711711
def grpc_config(self):
712-
grpc_config = merge_with_default(GRPC_DEFAULT_CONFIG, self.__cluster_description.get("grpc", {}))
713-
# specifying both `port` and `ssl_port` leads to erroneous behavior in ydbd, half of the incoming
714-
# connections use tls, half do not, so this is prohibited
715-
if grpc_config.get("ssl_port") is not None:
716-
del grpc_config["port"]
717-
return grpc_config
712+
return merge_with_default(GRPC_DEFAULT_CONFIG, self.__cluster_description.get("grpc", {}))
718713

719714
@property
720715
def dynamicnameservice_config(self):

0 commit comments

Comments
 (0)