From c800941ab7a5f3749bf84213ec7348841ca40343 Mon Sep 17 00:00:00 2001 From: Vitaly Baranov Date: Tue, 18 Aug 2020 18:08:50 +0300 Subject: [PATCH] Fix handling embedded config. --- src/Access/UsersConfigAccessStorage.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp index 6a8565fe83d..e4921ffe677 100644 --- a/src/Access/UsersConfigAccessStorage.cpp +++ b/src/Access/UsersConfigAccessStorage.cpp @@ -511,13 +511,14 @@ void UsersConfigAccessStorage::parseFromConfig(const Poco::Util::AbstractConfigu memory_storage.setAll(all_entities); } -void UsersConfigAccessStorage::load(const String & users_config_path, - const String & include_from_path, - const String & preprocessed_dir, - const zkutil::GetZooKeeper & get_zookeeper_function) +void UsersConfigAccessStorage::load( + const String & users_config_path, + const String & include_from_path, + const String & preprocessed_dir, + const zkutil::GetZooKeeper & get_zookeeper_function) { std::lock_guard lock{load_mutex}; - path = std::filesystem::canonical(users_config_path); + path = std::filesystem::path{users_config_path}.lexically_normal(); config_reloader.reset(); config_reloader = std::make_unique( users_config_path,