From 6a5bcf7f7dd1e3c1c669912d82591397dbe24a10 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 27 Nov 2024 11:17:23 -0500 Subject: [PATCH] postmaster: Reduce verbosity of environment dump debug message Emitting each variable separately is unnecessarily verbose / hard to skim over. Emit the whole thing in one ereport() to address that. Also remove program name and function reference from the message. The former doesn't seem particularly helpful and the latter is provided by the elog.c infrastructure these days. Reviewed-by: Heikki Linnakangas Reviewed-by: Peter Eisentraut Discussion: https://postgr.es/m/leouteo5ozcrux3fepuhtbp6c56tbfd4naxeokidbx7m75cabz@hhw6g4urlowt --- src/backend/postmaster/postmaster.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 78e66a06ac5..6376d430870 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -839,20 +839,20 @@ PostmasterMain(int argc, char *argv[]) #endif /* For debugging: display postmaster environment */ + if (message_level_is_interesting(DEBUG3)) { extern char **environ; char **p; + StringInfoData si; - ereport(DEBUG3, - (errmsg_internal("%s: PostmasterMain: initial environment dump:", - progname))); - ereport(DEBUG3, - (errmsg_internal("-----------------------------------------"))); + initStringInfo(&si); + + appendStringInfoString(&si, "initial environment dump:"); for (p = environ; *p; ++p) - ereport(DEBUG3, - (errmsg_internal("\t%s", *p))); - ereport(DEBUG3, - (errmsg_internal("-----------------------------------------"))); + appendStringInfo(&si, "\n%s", *p); + + ereport(DEBUG3, errmsg_internal("%s", si.data)); + pfree(si.data); } /* -- 2.39.5