database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-24 01:29:19 +03:00
Code Activity

Message editing: remove gratuitous variations in message wording, standardize

Browse Source 
terms, add some clarifications, fix some untranslatable attempts at dynamic
message building.
This commit is contained in:
Peter Eisentraut
2003-09-25 06:58:07 +00:00
parent 42013caf64
commit feb4f44d29
159 changed files with 1418 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/backend/postmaster/pgstat.c
View File

@@ -13,7 +13,7 @@
*
* Copyright (c) 2001-2003, PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.44 2003/09/07 14:44:40 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.45 2003/09/25 06:58:01 petere Exp $
* ----------
*/
#include "postgres.h"
@@ -217,7 +217,7 @@ pgstat_init(void)
{
ereport(LOG,
(errcode_for_socket_access(),
errmsg("could not create socket for statistics: %m")));
errmsg("could not create socket for statistics collector: %m")));
goto startup_failed;
}
@@ -229,7 +229,7 @@ pgstat_init(void)
{
ereport(LOG,
(errcode_for_socket_access(),
errmsg("could not bind socket for statistics: %m")));
errmsg("could not bind socket for statistics collector: %m")));
goto startup_failed;
}
@@ -241,7 +241,7 @@ pgstat_init(void)
{
ereport(LOG,
(errcode_for_socket_access(),
errmsg("could not get address of socket for statistics: %m")));
errmsg("could not get address of socket for statistics collector: %m")));
goto startup_failed;
}
@@ -255,7 +255,7 @@ pgstat_init(void)
{
ereport(LOG,
(errcode_for_socket_access(),
errmsg("could not connect socket for statistics: %m")));
errmsg("could not connect socket for statistics collector: %m")));
goto startup_failed;
}
@@ -269,7 +269,7 @@ pgstat_init(void)
{
ereport(LOG,
(errcode_for_socket_access(),
errmsg("could not set statistics socket to nonblock mode: %m")));
errmsg("could not set statistics collector socket to nonblocking mode: %m")));
goto startup_failed;
}
@@ -1328,7 +1328,7 @@ pgstat_main(void)
/* assume the problem is out-of-memory */
ereport(LOG,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory in statistics collector --- abort")));
errmsg("out of memory in statistics collector --- abort")));
exit(1);
}
@@ -1340,7 +1340,8 @@ pgstat_main(void)
if (pgStatBeTable == NULL)
{
ereport(LOG,
(errmsg("allocation of backend table failed")));
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory in statistics collector --- abort")));
exit(1);
}
memset(pgStatBeTable, 0, sizeof(PgStat_StatBeEntry) * MaxBackends);
@@ -1406,7 +1407,7 @@ pgstat_main(void)
continue;
ereport(LOG,
(errcode_for_socket_access(),
errmsg("select failed in statistics collector: %m")));
errmsg("select() failed in statistics collector: %m")));
exit(1);
}
@@ -1448,7 +1449,7 @@ pgstat_main(void)
continue;
ereport(LOG,
(errcode_for_socket_access(),
errmsg("could not read from statistics pipe: %m")));
errmsg("could not read from statistics collector pipe: %m")));
exit(1);
}
if (len == 0) /* EOF on the pipe! */
@@ -1617,7 +1618,7 @@ pgstat_recvbuffer(void)
{
ereport(LOG,
(errcode_for_socket_access(),
errmsg("could not set statistics pipe to nonblock mode: %m")));
errmsg("could not set statistics collector pipe to nonblocking mode: %m")));
exit(1);
}
@@ -1690,7 +1691,7 @@ pgstat_recvbuffer(void)
continue;
ereport(LOG,
(errcode_for_socket_access(),
errmsg("select failed in statistics buffer: %m")));
errmsg("select() failed in statistics buffer: %m")));
exit(1);
}
@@ -1706,7 +1707,7 @@ pgstat_recvbuffer(void)
{
ereport(LOG,
(errcode_for_socket_access(),
errmsg("failed to read statistics message: %m")));
errmsg("could not read statistics message: %m")));
exit(1);
}
@@ -1771,7 +1772,7 @@ pgstat_recvbuffer(void)
continue; /* not enough space in pipe */
ereport(LOG,
(errcode_for_socket_access(),
errmsg("failed to write statistics pipe: %m")));
errmsg("could not write to statistics collector pipe: %m")));
exit(1);
}
/* NB: len < xfr is okay */
@@ -1825,7 +1826,7 @@ pgstat_add_backend(PgStat_MsgHdr *msg)
if (msg->m_backendid < 1 || msg->m_backendid > MaxBackends)
{
ereport(LOG,
(errmsg("invalid backend ID %d", msg->m_backendid)));
(errmsg("invalid server process ID %d", msg->m_backendid)));
return -1;
}
@@ -2020,7 +2021,7 @@ pgstat_write_statsfile(void)
{
ereport(LOG,
(errcode_for_file_access(),
errmsg("could not write temp statistics file \"%s\": %m",
errmsg("could not open temporary statistics file \"%s\": %m",
pgStat_tmpfname)));
return;
}
@@ -2133,7 +2134,7 @@ pgstat_write_statsfile(void)
{
ereport(LOG,
(errcode_for_file_access(),
errmsg("could not write temp statistics file \"%s\": %m",
errmsg("could not close temporary statistics file \"%s\": %m",
pgStat_tmpfname)));
}
else
@@ -2142,7 +2143,7 @@ pgstat_write_statsfile(void)
{
ereport(LOG,
(errcode_for_file_access(),
errmsg("could not rename temp statistics file \"%s\" to \"%s\": %m",
errmsg("could not rename temporary statistics file \"%s\" to \"%s\": %m",
pgStat_tmpfname, pgStat_fname)));
}
}
@@ -2164,7 +2165,7 @@ pgstat_write_statsfile(void)
HASH_REMOVE, NULL) == NULL)
{
ereport(LOG,
(errmsg("dead-backend hash table corrupted "
(errmsg("dead-server-process hash table corrupted "
"during cleanup --- abort")));
exit(1);
}

28
src/backend/postmaster/postmaster.c
View File

@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.345 2003/09/12 19:33:59 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.346 2003/09/25 06:58:01 petere Exp $
*
* NOTES
*
@@ -358,9 +358,9 @@ checkDataDir(const char *checkdir)
if (fp == NULL)
{
fprintf(stderr,
gettext("%s could not find the database system.\n"
"Expected to find it in the PGDATA directory \"%s\",\n"
"but failed to open file \"%s\": %s\n"),
gettext("%s: could not find the database system\n"
"Expected to find it in the directory \"%s\",\n"
"but could not open file \"%s\": %s\n"),
progname, checkdir, path, strerror(errno));
ExitPostmaster(2);
}
@@ -582,7 +582,7 @@ PostmasterMain(int argc, char *argv[])
default:
fprintf(stderr,
gettext("Try '%s --help' for more information.\n"),
gettext("Try \"%s --help\" for more information.\n"),
progname);
ExitPostmaster(1);
}
@@ -595,7 +595,7 @@ PostmasterMain(int argc, char *argv[])
{
postmaster_error("invalid argument: \"%s\"", argv[optind]);
fprintf(stderr,
gettext("Try '%s --help' for more information.\n"),
gettext("Try \"%s --help\" for more information.\n"),
progname);
ExitPostmaster(1);
}
@@ -680,7 +680,7 @@ PostmasterMain(int argc, char *argv[])
#ifdef USE_SSL
if (EnableSSL && !NetServer)
{
postmaster_error("for SSL, TCP/IP connections must be enabled");
postmaster_error("TCP/IP connections must be enabled for SSL");
ExitPostmaster(1);
}
if (EnableSSL)
@@ -797,7 +797,7 @@ PostmasterMain(int argc, char *argv[])
ListenSocket, MAXLISTEN);
if (status != STATUS_OK)
ereport(FATAL,
(errmsg("could not create UNIX stream port")));
(errmsg("could not create Unix-domain socket")));
#endif
XLOGPathInit();
@@ -939,7 +939,7 @@ pmdaemonize(int argc, char *argv[])
#ifdef HAVE_SETSID
if (setsid() < 0)
{
postmaster_error("could not disassociate from controlling TTY: %s",
postmaster_error("could not dissociate from controlling TTY: %s",
strerror(errno));
ExitPostmaster(1);
}
@@ -1070,7 +1070,7 @@ ServerLoop(void)
continue;
ereport(LOG,
(errcode_for_socket_access(),
errmsg("select failed in postmaster: %m")));
errmsg("select() failed in postmaster: %m")));
return STATUS_ERROR;
}
@@ -2068,7 +2068,7 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
* translator: %s is a noun phrase describing a child process,
* such as "server process"
*/
(errmsg("%s (pid %d) exited with exit code %d",
(errmsg("%s (PID %d) exited with exit code %d",
procname, pid, WEXITSTATUS(exitstatus))));
else if (WIFSIGNALED(exitstatus))
ereport(lev,
@@ -2077,7 +2077,7 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
* translator: %s is a noun phrase describing a child process,
* such as "server process"
*/
(errmsg("%s (pid %d) was terminated by signal %d",
(errmsg("%s (PID %d) was terminated by signal %d",
procname, pid, WTERMSIG(exitstatus))));
else
ereport(lev,
@@ -2086,7 +2086,7 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
* translator: %s is a noun phrase describing a child process,
* such as "server process"
*/
(errmsg("%s (pid %d) exited with unexpected status %d",
(errmsg("%s (PID %d) exited with unexpected status %d",
procname, pid, exitstatus)));
}
@@ -2609,7 +2609,7 @@ sigusr1_handler(SIGNAL_ARGS)
ereport(LOG,
(errmsg("checkpoints are occurring too frequently (%d seconds apart)",
elapsed_secs),
errhint("Consider increasing 'checkpoint_segments'.")));
errhint("Consider increasing the configuration parameter \"checkpoint_segments\".")));
}
LastSignalledCheckpoint = now;
}