logging: Also add the command prefix to detail and hint messages

petere · petere · commit a8cca6026e99 · 2022-05-30T07:26:06.000+02:00
This makes the output line up better and allows filtering messages by command. Discussion: https://www.postgresql.org/message-id/ba6d4fac-9e33-91f9-94fb-1e4c144a48b9@enterprisedb.com
diff --git a/src/bin/pg_dump/t/003_pg_dump_with_server.pl b/src/bin/pg_dump/t/003_pg_dump_with_server.pl
@@ -30,7 +30,7 @@
 
 command_fails_like(
 	[ "pg_dump", '-p', $port, '--include-foreign-data=s0', 'postgres' ],
-	qr/foreign-data wrapper \"dummy\" has no handler\r?\ndetail: Query was: .*t0/,
+	qr/foreign-data wrapper \"dummy\" has no handler\r?\npg_dump: detail: Query was: .*t0/,
 	"correctly fails to dump a foreign table from a dummy FDW");
 
 command_ok(
diff --git a/src/common/logging.c b/src/common/logging.c
@@ -246,8 +246,7 @@ pg_log_generic_v(enum pg_log_level level, enum pg_log_part part,
 
 	fmt = _(fmt);
 
-	if (part == PG_LOG_PRIMARY &&
-		(!(log_flags & PG_LOG_FLAG_TERSE) || filename))
+	if (!(log_flags & PG_LOG_FLAG_TERSE) || filename)
 	{
 		if (sgr_locus)
 			fprintf(stderr, ANSI_ESCAPE_FMT, sgr_locus);

Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,7 @@ pg_log_generic_v(enum pg_log_level level, enum pg_log_part part,`
`246`	`246`
`247`	`247`	`fmt = _(fmt);`
`248`	`248`
`249`		`- if (part == PG_LOG_PRIMARY &&`
`250`		`- (!(log_flags & PG_LOG_FLAG_TERSE) \|\| filename))`
	`249`	`+ if (!(log_flags & PG_LOG_FLAG_TERSE) \|\| filename)`
`251`	`250`	`{`
`252`	`251`	`if (sgr_locus)`
`253`	`252`	`fprintf(stderr, ANSI_ESCAPE_FMT, sgr_locus);`