hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not re-initialize the log

Browse Source 
Do not re-initialize the log without it having been finished
in between.
This commit is contained in:
Johan Wikman 2018-08-30 14:59:34 +03:00
parent a13e95951b
commit 32c4e60516
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/gateway.cc
View File

@ -753,10 +753,8 @@ static void print_log_n_stderr(
{
if (do_log)
{
static bool log_is_inited = false;
if (log_is_inited || init_log())
if (mxb_log_inited() || init_log())
{
log_is_inited = true;
MXS_ERROR("%s%s%s%s",
logstr,
eno == 0 ? "" : " (",
@ -1860,6 +1858,14 @@ int main(int argc, char **argv)
goto return_main;
}
if (mxb_log_inited())
{
// If the log was inited due to some error logging *and* we did not exit,
// we need to close it so that it can be opened again, this time with
// the final settings.
mxs_log_finish();
}
if (!init_log())
{
rc = MAXSCALE_BADCONFIG;