diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2015-11-16 21:16:42 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2015-11-16 21:16:42 -0500 |
| commit | 689cabf402c33a69e595a0d25f61b1fb49fb1c78 (patch) | |
| tree | 519966d4b2c4fa4b9cc495a041f18ccf2f484f39 /src/backend/access/transam/xlog.c | |
| parent | 75c8af902e07a2090df429f410df1e753e3358f1 (diff) | |
| download | postgresql-689cabf402c33a69e595a0d25f61b1fb49fb1c78.tar.gz postgresql-689cabf402c33a69e595a0d25f61b1fb49fb1c78.zip | |
Message improvements
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 08d16823ed1..f17f83417d1 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4976,9 +4976,10 @@ readRecoveryCommandFile(void) else ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid value for recovery parameter \"%s\"", - "recovery_target_action"), - errhint("The allowed values are \"pause\", \"promote\", and \"shutdown\"."))); + errmsg("invalid value for recovery parameter \"%s\": \"%s\"", + "recovery_target_action", + item->value), + errhint("Valid values are \"pause\", \"promote\", and \"shutdown\"."))); ereport(DEBUG2, (errmsg_internal("recovery_target_action = '%s'", @@ -5058,7 +5059,9 @@ readRecoveryCommandFile(void) else ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid value for recovery parameter \"recovery_target\""), + errmsg("invalid value for recovery parameter \"%s\": \"%s\"", + "recovery_target", + item->value), errhint("The only allowed value is \"immediate\"."))); ereport(DEBUG2, (errmsg_internal("recovery_target = '%s'", @@ -6142,7 +6145,7 @@ StartupXLOG(void) unlink(TABLESPACE_MAP_OLD); if (rename(TABLESPACE_MAP, TABLESPACE_MAP_OLD) == 0) ereport(LOG, - (errmsg("ignoring \"%s\" file because no \"%s\" file exists", + (errmsg("ignoring file \"%s\" because no file \"%s\" exists", TABLESPACE_MAP, BACKUP_LABEL_FILE), errdetail("File \"%s\" was renamed to \"%s\".", TABLESPACE_MAP, TABLESPACE_MAP_OLD))); @@ -6150,7 +6153,7 @@ StartupXLOG(void) ereport(LOG, (errmsg("ignoring \"%s\" file because no \"%s\" file exists", TABLESPACE_MAP, BACKUP_LABEL_FILE), - errdetail("File \"%s\" could not be renamed to \"%s\": %m.", + errdetail("Could not rename file \"%s\" to \"%s\": %m.", TABLESPACE_MAP, TABLESPACE_MAP_OLD))); } @@ -6281,24 +6284,24 @@ StartupXLOG(void) LastRec = RecPtr = checkPointLoc; ereport(DEBUG1, - (errmsg("redo record is at %X/%X; shutdown %s", + (errmsg_internal("redo record is at %X/%X; shutdown %s", (uint32) (checkPoint.redo >> 32), (uint32) checkPoint.redo, wasShutdown ? "TRUE" : "FALSE"))); ereport(DEBUG1, - (errmsg("next transaction ID: %u/%u; next OID: %u", + (errmsg_internal("next transaction ID: %u/%u; next OID: %u", checkPoint.nextXidEpoch, checkPoint.nextXid, checkPoint.nextOid))); ereport(DEBUG1, - (errmsg("next MultiXactId: %u; next MultiXactOffset: %u", + (errmsg_internal("next MultiXactId: %u; next MultiXactOffset: %u", checkPoint.nextMulti, checkPoint.nextMultiOffset))); ereport(DEBUG1, - (errmsg("oldest unfrozen transaction ID: %u, in database %u", + (errmsg_internal("oldest unfrozen transaction ID: %u, in database %u", checkPoint.oldestXid, checkPoint.oldestXidDB))); ereport(DEBUG1, - (errmsg("oldest MultiXactId: %u, in database %u", + (errmsg_internal("oldest MultiXactId: %u, in database %u", checkPoint.oldestMulti, checkPoint.oldestMultiDB))); ereport(DEBUG1, - (errmsg("commit timestamp Xid oldest/newest: %u/%u", + (errmsg_internal("commit timestamp Xid oldest/newest: %u/%u", checkPoint.oldestCommitTs, checkPoint.newestCommitTs))); if (!TransactionIdIsNormal(checkPoint.nextXid)) |