From 3046b4a46e70cd19db95397fc4754f2981594d0c Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Mon, 25 Apr 2016 11:12:02 +0300 Subject: [PATCH] Fatal errors are always printed to stdout The daemon mode no longer controls which error messages are printed to stdout. This will allow easier detection of configuration and other errors in MaxScale. --- server/core/gateway.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/core/gateway.c b/server/core/gateway.c index 509f55920..849d3d18f 100644 --- a/server/core/gateway.c +++ b/server/core/gateway.c @@ -1607,7 +1607,7 @@ int main(int argc, char **argv) { static const char* logerr = "Failed to configure signal handlers. Exiting."; - print_log_n_stderr(true, !daemon_mode, logerr, logerr, 0); + print_log_n_stderr(true, true, logerr, logerr, 0); rc = MAXSCALE_INTERNALERROR; goto return_main; } @@ -1815,7 +1815,7 @@ int main(int argc, char **argv) char* fprerr = "Failed to open, read or process the MaxScale configuration " "file. Exiting. See the error log for details."; - print_log_n_stderr(false, !daemon_mode, fprerr, fprerr, 0); + print_log_n_stderr(false, true, fprerr, fprerr, 0); MXS_ERROR("Failed to open, read or process the MaxScale configuration file %s. " "Exiting.", cnf_file_path); @@ -1919,7 +1919,7 @@ int main(int argc, char **argv) if (n_services == 0) { char* logerr = "Failed to start any MaxScale services. Exiting."; - print_log_n_stderr(true, !daemon_mode, logerr, logerr, 0); + print_log_n_stderr(true, true, logerr, logerr, 0); rc = MAXSCALE_NOSERVICES; goto return_main; } @@ -1931,7 +1931,7 @@ int main(int argc, char **argv) if (thread_start(&log_flush_thr, log_flush_cb, (void *) &log_flush_timeout_ms) == NULL) { char* logerr = "Failed to start log flushing thread."; - print_log_n_stderr(true, !daemon_mode, logerr, logerr, 0); + print_log_n_stderr(true, true, logerr, logerr, 0); rc = MAXSCALE_INTERNALERROR; goto return_main; } @@ -1956,7 +1956,7 @@ int main(int argc, char **argv) (void *)(thread_id + 1)) == NULL) { char* logerr = "Failed to start worker thread."; - print_log_n_stderr(true, !daemon_mode, logerr, logerr, 0); + print_log_n_stderr(true, true, logerr, logerr, 0); rc = MAXSCALE_INTERNALERROR; goto return_main; }