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

MXS-2019: Remove header and footer output

Browse Source 
Now that the exit handlers work correctly, the output of `maxscale
--version` no longer consists of a single line but multiple lines in both
stdout and stderr. Removing the printing to stderr guarantees that the
correct output is produced.
This commit is contained in:
Markus Mäkelä
2018-08-19 21:56:53 +03:00
parent 57334153fe
commit c38dcff53c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/gateway.cc
View File

@ -1436,7 +1436,7 @@ int main(int argc, char **argv)
sigset_t sigpipe_mask; sigset_t sigpipe_mask;
sigset_t saved_mask; sigset_t saved_mask;
bool to_stdout = false; bool to_stdout = false;
void (*exitfunp[4])(void) = { mxs_log_finish, cleanup_process_datadir, write_footer, NULL }; void (*exitfunp[4])(void) = { mxs_log_finish, cleanup_process_datadir, NULL };
int numlocks = 0; int numlocks = 0;
bool pid_file_created = false; bool pid_file_created = false;
Worker* worker; Worker* worker;
@ -1454,7 +1454,6 @@ int main(int argc, char **argv)
progname = *argv; progname = *argv;
snprintf(datadir, PATH_MAX, "%s", default_datadir); snprintf(datadir, PATH_MAX, "%s", default_datadir);
datadir[PATH_MAX] = '\0'; datadir[PATH_MAX] = '\0';
file_write_header(stderr);
// Option string for getopt // 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"; const char accepted_opts[] = "dnce:f:g:l:vVs:S:?L:D:C:B:U:A:P:G:N:E:F:M:H:p";