Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
a3a14a9c
Commit
a3a14a9c
authored
Jun 11, 2019
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix log-level is not set with cmd-line or configuration file
parent
acfb3607
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/shrpx.cc
src/shrpx.cc
+2
-2
No files found.
src/shrpx.cc
View file @
a3a14a9c
...
@@ -2898,6 +2898,8 @@ int process_options(Config *config,
...
@@ -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) {
...
@@ -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) {
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment