From a8cca6026e992d9b627c7dbee5f8a50bde507a94 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 30 May 2022 07:18:57 +0200 Subject: [PATCH] logging: Also add the command prefix to detail and hint messages 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 --- src/bin/pg_dump/t/003_pg_dump_with_server.pl | 2 +- src/common/logging.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 index a0b23aae0fb..8cc9da06599 100644 --- 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 @@ my ($cmd, $stdout, $stderr, $result); 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 index 0b5bcb1a172..64604c52096 100644 --- 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);