Error message style adjustments, per Alvaro Herrera.
This commit is contained in:
parent
efcaf1e868
commit
5cc380f9a3
|
@ -7,7 +7,7 @@
|
||||||
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.152 2004/07/22 21:09:37 tgl Exp $
|
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.153 2004/08/01 17:45:42 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -1936,7 +1936,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
|
||||||
if (unlink(xlogpath) != 0)
|
if (unlink(xlogpath) != 0)
|
||||||
ereport(FATAL,
|
ereport(FATAL,
|
||||||
(errcode_for_file_access(),
|
(errcode_for_file_access(),
|
||||||
errmsg("could not remove \"%s\": %m",
|
errmsg("could not remove file \"%s\": %m",
|
||||||
xlogpath)));
|
xlogpath)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3772,7 +3772,7 @@ exitArchiveRecovery(TimeLineID endTLI, uint32 endLogId, uint32 endLogSeg)
|
||||||
if (rename(recoveryPath, xlogpath) != 0)
|
if (rename(recoveryPath, xlogpath) != 0)
|
||||||
ereport(FATAL,
|
ereport(FATAL,
|
||||||
(errcode_for_file_access(),
|
(errcode_for_file_access(),
|
||||||
errmsg("could not rename \"%s\" to \"%s\": %m",
|
errmsg("could not rename file \"%s\" to \"%s\": %m",
|
||||||
recoveryPath, xlogpath)));
|
recoveryPath, xlogpath)));
|
||||||
/* XXX might we need to fix permissions on the file? */
|
/* XXX might we need to fix permissions on the file? */
|
||||||
}
|
}
|
||||||
|
@ -3814,7 +3814,7 @@ exitArchiveRecovery(TimeLineID endTLI, uint32 endLogId, uint32 endLogSeg)
|
||||||
if (rename(recoveryCommandFile, recoveryCommandDone) != 0)
|
if (rename(recoveryCommandFile, recoveryCommandDone) != 0)
|
||||||
ereport(FATAL,
|
ereport(FATAL,
|
||||||
(errcode_for_file_access(),
|
(errcode_for_file_access(),
|
||||||
errmsg("could not rename \"%s\" to \"%s\": %m",
|
errmsg("could not rename file \"%s\" to \"%s\": %m",
|
||||||
recoveryCommandFile, recoveryCommandDone)));
|
recoveryCommandFile, recoveryCommandDone)));
|
||||||
|
|
||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.2 2004/07/21 22:31:22 tgl Exp $
|
* $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.3 2004/08/01 17:45:43 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -587,6 +587,6 @@ pgarch_archiveDone(char *xlog)
|
||||||
if (rename(rlogready, rlogdone) < 0)
|
if (rename(rlogready, rlogdone) < 0)
|
||||||
ereport(WARNING,
|
ereport(WARNING,
|
||||||
(errcode_for_file_access(),
|
(errcode_for_file_access(),
|
||||||
errmsg("could not rename \"%s\" to \"%s\": %m",
|
errmsg("could not rename file \"%s\" to \"%s\": %m",
|
||||||
rlogready, rlogdone)));
|
rlogready, rlogdone)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.417 2004/07/31 00:45:33 tgl Exp $
|
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.418 2004/08/01 17:45:43 tgl Exp $
|
||||||
*
|
*
|
||||||
* NOTES
|
* NOTES
|
||||||
*
|
*
|
||||||
|
@ -544,7 +544,7 @@ PostmasterMain(int argc, char *argv[])
|
||||||
if (!guc_pgdata) /* Got a pgdata from the config file? */
|
if (!guc_pgdata) /* Got a pgdata from the config file? */
|
||||||
{
|
{
|
||||||
write_stderr("%s does not know where to find the database system data.\n"
|
write_stderr("%s does not know where to find the database system data.\n"
|
||||||
"This should be specified as 'pgdata' in %s%s.\n",
|
"This should be specified as \"pgdata\" in %s%s.\n",
|
||||||
progname, userPGDATA,
|
progname, userPGDATA,
|
||||||
user_pgconfig_is_dir ? "/postgresql.conf" : "");
|
user_pgconfig_is_dir ? "/postgresql.conf" : "");
|
||||||
ExitPostmaster(2);
|
ExitPostmaster(2);
|
||||||
|
|
Loading…
Reference in New Issue