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

Merge pull request #34718 from amosbird/logfilecmd

Browse Source 
Allow only to specify --log-file without configuration
This commit is contained in:
Nikolay Degterinsky 2022-02-19 16:11:27 +03:00 committed by GitHub
commit c3c1344f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base/loggers/Loggers.cpp
View File

@ -247,11 +247,8 @@ void Loggers::updateLevels(Poco::Util::AbstractConfiguration & config, Poco::Log
if (log_level > max_log_level) if (log_level > max_log_level)
max_log_level = log_level; max_log_level = log_level;
const auto log_path = config.getString("logger.log", ""); if (log_file)
if (!log_path.empty())
split->setLevel("log", log_level); split->setLevel("log", log_level);
else
split->setLevel("log", 0);
// Set level to console // Set level to console
bool is_daemon = config.getBool("application.runAsDaemon", false); bool is_daemon = config.getBool("application.runAsDaemon", false);
@ -263,15 +260,13 @@ void Loggers::updateLevels(Poco::Util::AbstractConfiguration & config, Poco::Log
split->setLevel("console", 0); split->setLevel("console", 0);
// Set level to errorlog // Set level to errorlog
int errorlog_level = 0; if (error_log_file)
const auto errorlog_path = config.getString("logger.errorlog", "");
if (!errorlog_path.empty())
{ {
errorlog_level = Poco::Logger::parseLevel(config.getString("logger.errorlog_level", "notice")); int errorlog_level = Poco::Logger::parseLevel(config.getString("logger.errorlog_level", "notice"));
if (errorlog_level > max_log_level) if (errorlog_level > max_log_level)
max_log_level = errorlog_level; max_log_level = errorlog_level;
split->setLevel("errorlog", errorlog_level);
} }
split->setLevel("errorlog", errorlog_level);
// Set level to syslog // Set level to syslog
int syslog_level = 0; int syslog_level = 0;