Message style improvements

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 70273be783a4a14a634934a93a5dff8bdd96772b..acf610808e3b176aa1dbfe8eb5c65cffe325c04f 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1049,7 +1049,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 b029118bf604b2eff4667bf915db3b4bee9a6e9f..90a3f41bbbe41433dfb0855775e1790ea4ae6bec 100644 (file)
--- 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 b591fcc864a674018a59656ca23fd368505d7615..8c00ec9a3b1a27177cf1db8de96e4354d0452585 100644 (file)
--- 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 8af5c7bebdb1a875a4d0ec5cf2bce0aa59b0e9f7..cf6789dfed6a2623f47fce9b5b830a7d0e493a4d 100644 (file)
--- 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 66e0a610ab75d5b4a8f1406af5a383475e30f27e..c04f417cf053b424fc83e53c53e68f7677f5010b 100644 (file)
--- 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 73f395f2a3509ac401451375529e6555b8a2f665..d76f27c9e8f8692da579120aeb6e296fe5a5cee4 100644 (file)
--- 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"));