walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix log-level is not set with cmd-line or configuration file

This commit is contained in:
Tatsuhiro Tsujikawa 2019-06-11 23:13:43 +09:00
parent acfb360770
commit a3a14a9cde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shrpx.cc
View File

@ -2898,6 +2898,8 @@ int process_options(Config *config,
assert(include_set.empty()); assert(include_set.empty());
} }
Log::set_severity_level(config->logging.severity);
auto &loggingconf = config->logging; auto &loggingconf = config->logging;
if (loggingconf.access.syslog || loggingconf.error.syslog) { if (loggingconf.access.syslog || loggingconf.error.syslog) {
@ -3202,7 +3204,6 @@ void reload_config(WorkerProcess *wp) {
// configuration can be obtained from get_config(). // configuration can be obtained from get_config().
auto old_config = replace_config(std::move(new_config)); auto old_config = replace_config(std::move(new_config));
Log::set_severity_level(get_config()->logging.severity);
auto pid = fork_worker_process(ipc_fd, iaddrs); auto pid = fork_worker_process(ipc_fd, iaddrs);
@ -3210,7 +3211,6 @@ void reload_config(WorkerProcess *wp) {
LOG(ERROR) << "Failed to process new configuration"; LOG(ERROR) << "Failed to process new configuration";
new_config = replace_config(std::move(old_config)); new_config = replace_config(std::move(old_config));
Log::set_severity_level(get_config()->logging.severity);
close_not_inherited_fd(new_config.get(), iaddrs); close_not_inherited_fd(new_config.get(), iaddrs);
return; return;