diff options
| author | Vitalii Gridnev <gridnevvvit@gmail.com> | 2022-06-15 13:44:02 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2022-06-15 13:44:02 +0300 |
| commit | 9d200e5bcf064005177db031e405e346a73d50c2 (patch) | |
| tree | be32a60590bddfd2977d54437c0ca3c7dd90fd12 | |
| parent | 5a3638c13b62d589c8a63c99b28dc19f666fd4a7 (diff) | |
| download | ydb-9d200e5bcf064005177db031e405e346a73d50c2.tar.gz | |
reorder config loading KIKIMR-15082
REVIEW: 2632535
x-ydb-stable-ref: 5a50e849f17e840e81c76e25f7ad017110b91b0d
| -rw-r--r-- | ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp index 79c95e80d5..387f17d822 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp @@ -311,10 +311,9 @@ protected: #define OPTION_MERGE(NAME, FIELD) MutableConfigPartMerge(config, NAME, &NKikimrConfig::TAppConfig::Mutable##FIELD) OPTION("auth-file", AuthConfig); - OPTION_MERGE("auth-token-file", AuthConfig); - LoadBaseConfig(config); LoadYamlConfig(); + OPTION_MERGE("auth-token-file", AuthConfig); // start memorylog as soon as possible if (auto mem = OPTION("memorylog-file", MemoryLogConfig)) { |