From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 24 Apr 2008 14:23:43 +0000 (+0000)
Subject: Update error messages, per notes from Tom.
X-Git-Tag: recoveryinfrav9~1158
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=e50ac04ed1812e3b6e2d638faeb78bf5a5d68681;p=users%2Fsimon%2Fpostgres.git

Update error messages, per notes from Tom.

Laurenz Albe
---

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 7ed3a7187d..9c16654abc 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7101,14 +7101,15 @@ CancelBackup(void)
 	{
 		ereport(LOG,
 				(errmsg("online backup mode cancelled"),
-				 errdetail("\"%s\" renamed to \"%s\"",
+				 errdetail("\"%s\" was renamed to \"%s\".",
 						BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
 	}
 	else
 	{
 		ereport(WARNING,
 				(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)));
 	}
 }
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index ec4385cfac..37757dd7fa 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -767,8 +767,8 @@ do_stop(void)
 	{
 		if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0))
 		{
-			print_msg(_("WARNING: online backup mode is active; must be ended\n"
-						"   with pg_stop_backup() for shutdown to complete\n\n"));
+			print_msg(_("WARNING: online backup mode is active.\n"
+						"Shutdown will not complete until pg_stop_backup() is called.\n\n"));
 		}
 
 		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))
 		{
-			print_msg(_("WARNING: online backup mode is active; must be ended\n"
-						"   with pg_stop_backup() for shutdown to complete\n\n"));
+			print_msg(_("WARNING: online backup mode is active.\n"
+						"Shutdown will not complete until pg_stop_backup() is called.\n\n"));
 		}
 
 		print_msg(_("waiting for server to shut down..."));