mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Further message changes when recovery.conf parameters missing.

Browse Source
This commit is contained in:
Simon Riggs 2010-04-06 17:51:58 +00:00
parent 492d9f2309
commit 89c5008158
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, 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.388 2010/04/02 21:50:40 sriggs Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.389 2010/04/06 17:51:58 sriggs Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -5092,15 +5092,16 @@ readRecoveryCommandFile(void)
if (StandbyMode) if (StandbyMode)
{ {
if (PrimaryConnInfo == NULL && recoveryRestoreCommand == NULL) if (PrimaryConnInfo == NULL && recoveryRestoreCommand == NULL)
ereport(FATAL, ereport(WARNING,
(errmsg("recovery command file \"%s\" specified neither primary_conninfo nor restore_command", (errmsg("recovery command file \"%s\" specified neither primary_conninfo nor restore_command",
RECOVERY_COMMAND_FILE))); RECOVERY_COMMAND_FILE),
errhint("The database server will regularly poll the pg_xlog subdirectory to check for files placed there.")));
} }
else else
{ {
if (recoveryRestoreCommand == NULL) if (recoveryRestoreCommand == NULL)
ereport(FATAL, ereport(FATAL,
(errmsg("recovery command file \"%s\" did not specify restore_command nor standby_mode", (errmsg("recovery command file \"%s\" must specify restore_command when standby mode is not enabled",
RECOVERY_COMMAND_FILE))); RECOVERY_COMMAND_FILE)));
} }