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

Register atexit functions in the correct place

Browse Source 
The atexit functions should be registered after there is a need for
them. This fixes the problem where cleanup functions were called before
the initialization for them was done. Also removed the header and footer
printint to stdout.
This commit is contained in:
Markus Mäkelä 2018-08-19 22:03:21 +03:00
parent 930be8d77a
commit fe7a73e5c3
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/core/gateway.cc
View File

@ -1335,7 +1335,6 @@ int main(int argc, char **argv)
sigset_t sigpipe_mask;
sigset_t saved_mask;
bool to_stdout = false;
void (*exitfunp[5])(void) = { mxs_log_finish, cleanup_process_datadir, write_footer, unlock_directories, NULL };
int numlocks = 0;
bool pid_file_created = false;
Worker* worker;
@ -1353,27 +1352,10 @@ int main(int argc, char **argv)
progname = *argv;
snprintf(datadir, PATH_MAX, "%s", default_datadir);
datadir[PATH_MAX] = '\0';
file_write_header(stderr);
// Option string for getopt
const char accepted_opts[] = "dnce:f:g:l:vVs:S:?L:D:C:B:U:A:P:G:N:E:F:M:H:p";
/*<
* Register functions which are called at exit.
*/
for (int i = 0; exitfunp[i] != NULL; i++)
{
int l = atexit(exitfunp[i]);
if (l != 0)
{
const char* fprerr = "Failed to register exit functions for MaxScale";
print_log_n_stderr(false, true, NULL, fprerr, 0);
rc = MAXSCALE_INTERNALERROR;
goto return_main;
}
}
#ifdef HAVE_GLIBC
while ((opt = getopt_long(argc, argv, accepted_opts,
long_options, &option_index)) != -1)
@ -1883,6 +1865,8 @@ int main(int argc, char **argv)
mxs_log_set_syslog_enabled(*syslog_enabled);
mxs_log_set_maxlog_enabled(*maxlog_enabled);
atexit(mxs_log_finish);
}
if (!config_load_global(cnf_file_path))
@ -1920,6 +1904,7 @@ int main(int argc, char **argv)
if (create_datadir(get_datadir(), datadir))
{
set_process_datadir(datadir);
atexit(cleanup_process_datadir);
}
else
{
@ -2013,6 +1998,8 @@ int main(int argc, char **argv)
rc = MAXSCALE_ALREADYRUNNING;
goto return_main;
}
atexit(unlock_directories);
}
if (!redirect_output_to.empty())