thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 01:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling embedded config.

Browse Source
This commit is contained in:
Vitaly Baranov 2020-08-18 18:08:50 +03:00
parent e6c6f904bb
commit c800941ab7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Access/UsersConfigAccessStorage.cpp
View File

@ -511,13 +511,14 @@ void UsersConfigAccessStorage::parseFromConfig(const Poco::Util::AbstractConfigu
memory_storage.setAll(all_entities);
}
void UsersConfigAccessStorage::load(const String & users_config_path,
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<ConfigReloader>(
users_config_path,