From e435c1e7d9d88264453c30f8d1969cb836a60509 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 9 Jul 2019 15:47:09 +0200 Subject: [PATCH] Message style improvements --- src/bin/initdb/initdb.c | 2 +- src/bin/pg_basebackup/pg_recvlogical.c | 5 ++--- src/bin/pg_checksums/pg_checksums.c | 4 ++-- src/bin/pg_dump/pg_backup_db.c | 4 ++-- src/bin/pg_dump/pg_dumpall.c | 6 +++--- src/bin/pg_upgrade/option.c | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index f1acbdfcf2..04d77ad700 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -1051,7 +1051,7 @@ test_config_settings(void) else printf("%dkB\n", n_buffers * (BLCKSZ / 1024)); - printf(_("selecting default timezone ... ")); + printf(_("selecting default time zone ... ")); fflush(stdout); default_timezone = select_default_timezone(share_path); printf("%s\n", default_timezone ? default_timezone : "GMT"); diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c index b029118bf6..90a3f41bbb 100644 --- a/src/bin/pg_basebackup/pg_recvlogical.c +++ b/src/bin/pg_basebackup/pg_recvlogical.c @@ -1020,12 +1020,11 @@ prepareToTerminate(PGconn *conn, XLogRecPtr endpos, bool keepalive, XLogRecPtr l if (verbose) { if (keepalive) - pg_log_info("endpos %X/%X reached by keepalive", + pg_log_info("end position %X/%X reached by keepalive", (uint32) (endpos >> 32), (uint32) endpos); else - pg_log_info("endpos %X/%X reached by record at %X/%X", + pg_log_info("end position %X/%X reached by WAL record at %X/%X", (uint32) (endpos >> 32), (uint32) (endpos), (uint32) (lsn >> 32), (uint32) lsn); - } } diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c index b591fcc864..8c00ec9a3b 100644 --- a/src/bin/pg_checksums/pg_checksums.c +++ b/src/bin/pg_checksums/pg_checksums.c @@ -235,7 +235,7 @@ scan_file(const char *fn, BlockNumber segmentno) /* Write block with checksum */ if (write(f, buf.data, BLCKSZ) != BLCKSZ) { - pg_log_error("could not update checksum of block %u in file \"%s\": %m", + pg_log_error("could not write block %u in file \"%s\": %m", blockno, fn); exit(1); } @@ -469,7 +469,7 @@ main(int argc, char *argv[]) /* filenode checking only works in --check mode */ if (mode != PG_MODE_CHECK && only_filenode) { - pg_log_error("--filenode option only possible with --check"); + pg_log_error("option -f/--filenode can only be used with --check"); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c index 401e0c8883..ee822c5249 100644 --- a/src/bin/pg_dump/pg_backup_db.c +++ b/src/bin/pg_dump/pg_backup_db.c @@ -176,7 +176,7 @@ _connectDB(ArchiveHandle *AH, const char *reqdb, const char *requser) newConn = PQconnectdbParams(keywords, values, true); if (!newConn) - fatal("failed to reconnect to database"); + fatal("could not reconnect to database"); if (PQstatus(newConn) == CONNECTION_BAD) { @@ -287,7 +287,7 @@ ConnectDatabase(Archive *AHX, AH->connection = PQconnectdbParams(keywords, values, true); if (!AH->connection) - fatal("failed to connect to database"); + fatal("could not connect to database"); if (PQstatus(AH->connection) == CONNECTION_BAD && PQconnectionNeedsPassword(AH->connection) && diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 158c0c74b2..0981efcf5d 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -482,7 +482,7 @@ main(int argc, char *argv[]) OPF = fopen(filename, PG_BINARY_W); if (!OPF) { - pg_log_error("could not open the output file \"%s\": %m", + pg_log_error("could not open output file \"%s\": %m", filename); exit_nicely(1); } @@ -1492,11 +1492,11 @@ dumpDatabases(PGconn *conn) /* Skip any explicitly excluded database */ if (simple_string_list_member(&database_exclude_names, dbname)) { - pg_log_info("excluding database \"%s\"...", dbname); + pg_log_info("excluding database \"%s\"", dbname); continue; } - pg_log_info("dumping database \"%s\"...", dbname); + pg_log_info("dumping database \"%s\"", dbname); fprintf(OPF, "--\n-- Database \"%s\" dump\n--\n\n", dbname); diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c index 73f395f2a3..d76f27c9e8 100644 --- a/src/bin/pg_upgrade/option.c +++ b/src/bin/pg_upgrade/option.c @@ -304,7 +304,7 @@ usage(void) printf(_(" -p, --old-port=PORT old cluster port number (default %d)\n"), old_cluster.port); printf(_(" -P, --new-port=PORT new cluster port number (default %d)\n"), new_cluster.port); printf(_(" -r, --retain retain SQL and log files after success\n")); - printf(_(" -s, --socketdir=DIR socket directory to use (default CWD)\n")); + printf(_(" -s, --socketdir=DIR socket directory to use (default current dir.)\n")); printf(_(" -U, --username=NAME cluster superuser (default \"%s\")\n"), os_info.user); printf(_(" -v, --verbose enable verbose internal logging\n")); printf(_(" -V, --version display version information, then exit\n")); -- 2.40.0