|
7 | 7 | * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group |
8 | 8 | * Portions Copyright (c) 1994, Regents of the University of California |
9 | 9 | * |
10 | | - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.388 2010/04/02 21:50:40 sriggs Exp $ |
| 10 | + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.389 2010/04/06 17:51:58 sriggs Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -5092,15 +5092,16 @@ readRecoveryCommandFile(void) |
5092 | 5092 | if (StandbyMode) |
5093 | 5093 | { |
5094 | 5094 | if (PrimaryConnInfo==NULL&&recoveryRestoreCommand==NULL) |
5095 | | -ereport(FATAL, |
| 5095 | +ereport(WARNING, |
5096 | 5096 | (errmsg("recovery command file \"%s\" specified neither primary_conninfo nor restore_command", |
5097 | | -RECOVERY_COMMAND_FILE))); |
| 5097 | +RECOVERY_COMMAND_FILE), |
| 5098 | +errhint("The database server will regularly poll the pg_xlog subdirectory to check for files placed there."))); |
5098 | 5099 | } |
5099 | 5100 | else |
5100 | 5101 | { |
5101 | 5102 | if (recoveryRestoreCommand==NULL) |
5102 | 5103 | ereport(FATAL, |
5103 | | -(errmsg("recovery command file \"%s\"did notspecify restore_commandnor standby_mode", |
| 5104 | +(errmsg("recovery command file \"%s\"mustspecify restore_commandwhen standby mode is not enabled", |
5104 | 5105 | RECOVERY_COMMAND_FILE))); |
5105 | 5106 | } |
5106 | 5107 |
|
|