From db20e006f16de889ceb884d63dd25828ec711185 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 18 Mar 2024 14:08:45 +0900 Subject: [PATCH v2] set saved_timeval_set to false before executing emit_log_hook() --- src/backend/utils/error/elog.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 52bc01058c..ea96047352 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -154,7 +154,7 @@ static int recursion_depth = 0; /* to detect actual recursion */ /* * Saved timeval and buffers for formatted timestamps that might be used by - * both log_line_prefix and csv logs. + * log_line_prefix, csv logs and json logs. */ static struct timeval saved_timeval; static bool saved_timeval_set = false; @@ -1678,6 +1678,14 @@ EmitErrorReport(void) CHECK_STACK_DEPTH(); oldcontext = MemoryContextSwitchTo(edata->assoc_context); + /* + * Reset the formatted timestamp fields before emitting any logs. This + * includes all the log destinations and the hook, as the latter may use + * Log_line_prefix. + */ + saved_timeval_set = false; + formatted_log_time[0] = '\0'; + /* * Call hook before sending message to log. The hook function is allowed * to turn off edata->output_to_server, so we must recheck that afterward. @@ -2948,8 +2956,6 @@ log_status_format(StringInfo buf, const char *format, ErrorData *edata) appendStringInfo(buf, "%ld", log_line_number); break; case 'm': - /* force a log timestamp reset */ - formatted_log_time[0] = '\0'; (void) get_formatted_log_time(); if (padding != 0) @@ -3151,9 +3157,6 @@ send_message_to_server_log(ErrorData *edata) initStringInfo(&buf); - saved_timeval_set = false; - formatted_log_time[0] = '\0'; - log_line_prefix(&buf, edata); appendStringInfo(&buf, "%s: ", _(error_severity(edata->elevel))); -- 2.43.0