From 0a1cdccebdd79901b98ce1b389c13b2fb27c0932 Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Wed, 26 May 2021 11:05:45 +0200 Subject: [PATCH] MINOR: log: do not discard stderr when starting is over Always print message in ha_alert/warning/notice when starting is over, regardless of quiet/verbose options. This change is useful to retrieve the output via the newly implemented user messages buffer at runtime, for the CLI handlers. --- src/errors.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/errors.c b/src/errors.c index b2ff42970..9da04f918 100644 --- a/src/errors.c +++ b/src/errors.c @@ -129,8 +129,9 @@ void ha_alert(const char *fmt, ...) { va_list argp; - if (!(global.mode & MODE_QUIET) || (global.mode & (MODE_VERBOSE | MODE_STARTING))) { - if (!(warned & WARN_EXEC_PATH)) { + if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE) || + !(global.mode & MODE_STARTING)) { + if (!(warned & WARN_EXEC_PATH) && (global.mode & MODE_STARTING)) { const char *path = get_exec_path(); warned |= WARN_EXEC_PATH; @@ -153,7 +154,8 @@ void ha_warning(const char *fmt, ...) warned |= WARN_ANY; - if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) { + if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE) || + !(global.mode & MODE_STARTING)) { va_start(argp, fmt); print_message("WARNING", fmt, argp); va_end(argp); @@ -203,7 +205,8 @@ void ha_notice(const char *fmt, ...) { va_list argp; - if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) { + if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE) || + !(global.mode & MODE_STARTING)) { va_start(argp, fmt); print_message("NOTICE", fmt, argp); va_end(argp);