thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2122 from proller/fix14

Browse Source 
CLICKHOUSE-3630: Fix race on logger reload, enable reload
This commit is contained in:
alexey-milovidov 2018-03-29 04:30:30 +03:00 committed by GitHub
commit 54986af313
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/poco vendored

@ -1 +1 @@
Subproject commit 8238852d7ab2a4abdf87adff233b3b83686f4fe4
Subproject commit 3dae7c46e813d884d15ff509f6dcc1693417646f

1
dbms/src/Server/Server.cpp
View File

@ -230,6 +230,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
std::move(main_config_zk_node_cache),
[&](ConfigurationPtr config)
{
buildLoggers(*config);
global_context->setClustersConfig(config);
global_context->setMacros(std::make_unique<Macros>(*config, "macros"));
},