rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update error messages, per notes from Tom. 

Laurenz Albe
This commit is contained in:
Magnus Hagander 2008-04-24 14:23:43 +00:00
parent 19750904c8
commit 380d1ee69e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/access/transam/xlog.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, 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.299 2008/04/23 13:44:58 mha Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.300 2008/04/24 14:23:43 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -7101,14 +7101,15 @@ CancelBackup(void)
{ {
ereport(LOG, ereport(LOG,
(errmsg("online backup mode cancelled"), (errmsg("online backup mode cancelled"),
errdetail("\"%s\" renamed to \"%s\"", errdetail("\"%s\" was renamed to \"%s\".",
BACKUP_LABEL_FILE, BACKUP_LABEL_OLD))); BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
} }
else else
{ {
ereport(WARNING, ereport(WARNING,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not rename \"%s\" to \"%s\", backup mode not cancelled: %m", errmsg("online backup mode was not cancelled"),
errdetail("Could not rename \"%s\" to \"%s\": %m.",
BACKUP_LABEL_FILE, BACKUP_LABEL_OLD))); BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
} }
} }

10
src/bin/pg_ctl/pg_ctl.c
View File

@ -4,7 +4,7 @@
* *
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.97 2008/04/23 13:44:59 mha Exp $ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.98 2008/04/24 14:23:43 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -767,8 +767,8 @@ do_stop(void)
{ {
if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0)) if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0))
{ {
print_msg(_("WARNING: online backup mode is active; must be ended\n" print_msg(_("WARNING: online backup mode is active.\n"
" with pg_stop_backup() for shutdown to complete\n\n")); "Shutdown will not complete until pg_stop_backup() is called.\n\n"));
} }
print_msg(_("waiting for server to shut down...")); print_msg(_("waiting for server to shut down..."));
@ -844,8 +844,8 @@ do_restart(void)
if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0)) if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0))
{ {
print_msg(_("WARNING: online backup mode is active; must be ended\n" print_msg(_("WARNING: online backup mode is active.\n"
" with pg_stop_backup() for shutdown to complete\n\n")); "Shutdown will not complete until pg_stop_backup() is called.\n\n"));
} }
print_msg(_("waiting for server to shut down...")); print_msg(_("waiting for server to shut down..."));