mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-06 22:19:20 +02:00
Message style improvements
This commit is contained in:
parent
5526baf549
commit
48d6d5a2af
@ -1049,7 +1049,7 @@ test_config_settings(void)
|
|||||||
else
|
else
|
||||||
printf("%dkB\n", n_buffers * (BLCKSZ / 1024));
|
printf("%dkB\n", n_buffers * (BLCKSZ / 1024));
|
||||||
|
|
||||||
printf(_("selecting default timezone ... "));
|
printf(_("selecting default time zone ... "));
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
default_timezone = select_default_timezone(share_path);
|
default_timezone = select_default_timezone(share_path);
|
||||||
printf("%s\n", default_timezone ? default_timezone : "GMT");
|
printf("%s\n", default_timezone ? default_timezone : "GMT");
|
||||||
|
@ -1020,12 +1020,11 @@ prepareToTerminate(PGconn *conn, XLogRecPtr endpos, bool keepalive, XLogRecPtr l
|
|||||||
if (verbose)
|
if (verbose)
|
||||||
{
|
{
|
||||||
if (keepalive)
|
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);
|
(uint32) (endpos >> 32), (uint32) endpos);
|
||||||
else
|
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) (endpos >> 32), (uint32) (endpos),
|
||||||
(uint32) (lsn >> 32), (uint32) lsn);
|
(uint32) (lsn >> 32), (uint32) lsn);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -235,7 +235,7 @@ scan_file(const char *fn, BlockNumber segmentno)
|
|||||||
/* Write block with checksum */
|
/* Write block with checksum */
|
||||||
if (write(f, buf.data, BLCKSZ) != BLCKSZ)
|
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);
|
blockno, fn);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
@ -469,7 +469,7 @@ main(int argc, char *argv[])
|
|||||||
/* filenode checking only works in --check mode */
|
/* filenode checking only works in --check mode */
|
||||||
if (mode != PG_MODE_CHECK && only_filenode)
|
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"),
|
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
|
||||||
progname);
|
progname);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
@ -176,7 +176,7 @@ _connectDB(ArchiveHandle *AH, const char *reqdb, const char *requser)
|
|||||||
newConn = PQconnectdbParams(keywords, values, true);
|
newConn = PQconnectdbParams(keywords, values, true);
|
||||||
|
|
||||||
if (!newConn)
|
if (!newConn)
|
||||||
fatal("failed to reconnect to database");
|
fatal("could not reconnect to database");
|
||||||
|
|
||||||
if (PQstatus(newConn) == CONNECTION_BAD)
|
if (PQstatus(newConn) == CONNECTION_BAD)
|
||||||
{
|
{
|
||||||
@ -287,7 +287,7 @@ ConnectDatabase(Archive *AHX,
|
|||||||
AH->connection = PQconnectdbParams(keywords, values, true);
|
AH->connection = PQconnectdbParams(keywords, values, true);
|
||||||
|
|
||||||
if (!AH->connection)
|
if (!AH->connection)
|
||||||
fatal("failed to connect to database");
|
fatal("could not connect to database");
|
||||||
|
|
||||||
if (PQstatus(AH->connection) == CONNECTION_BAD &&
|
if (PQstatus(AH->connection) == CONNECTION_BAD &&
|
||||||
PQconnectionNeedsPassword(AH->connection) &&
|
PQconnectionNeedsPassword(AH->connection) &&
|
||||||
|
@ -482,7 +482,7 @@ main(int argc, char *argv[])
|
|||||||
OPF = fopen(filename, PG_BINARY_W);
|
OPF = fopen(filename, PG_BINARY_W);
|
||||||
if (!OPF)
|
if (!OPF)
|
||||||
{
|
{
|
||||||
pg_log_error("could not open the output file \"%s\": %m",
|
pg_log_error("could not open output file \"%s\": %m",
|
||||||
filename);
|
filename);
|
||||||
exit_nicely(1);
|
exit_nicely(1);
|
||||||
}
|
}
|
||||||
@ -1492,11 +1492,11 @@ dumpDatabases(PGconn *conn)
|
|||||||
/* Skip any explicitly excluded database */
|
/* Skip any explicitly excluded database */
|
||||||
if (simple_string_list_member(&database_exclude_names, dbname))
|
if (simple_string_list_member(&database_exclude_names, dbname))
|
||||||
{
|
{
|
||||||
pg_log_info("excluding database \"%s\"...", dbname);
|
pg_log_info("excluding database \"%s\"", dbname);
|
||||||
continue;
|
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);
|
fprintf(OPF, "--\n-- Database \"%s\" dump\n--\n\n", dbname);
|
||||||
|
|
||||||
|
@ -304,7 +304,7 @@ usage(void)
|
|||||||
printf(_(" -p, --old-port=PORT old cluster port number (default %d)\n"), old_cluster.port);
|
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(_(" -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(_(" -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(_(" -U, --username=NAME cluster superuser (default \"%s\")\n"), os_info.user);
|
||||||
printf(_(" -v, --verbose enable verbose internal logging\n"));
|
printf(_(" -v, --verbose enable verbose internal logging\n"));
|
||||||
printf(_(" -V, --version display version information, then exit\n"));
|
printf(_(" -V, --version display version information, then exit\n"));
|
||||||
|
Loading…
Reference in New Issue
Block a user