Commit b30769ee authored by Peter Eisentraut's avatar Peter Eisentraut

When logging the recovery.conf parameters, show them quoted as they would

appear in the configuration file.
parent 1f735c32
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, 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.288 2007/11/15 21:14:32 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.289 2007/11/15 22:02:12 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -4377,7 +4377,7 @@ readRecoveryCommandFile(void) ...@@ -4377,7 +4377,7 @@ readRecoveryCommandFile(void)
{ {
recoveryRestoreCommand = pstrdup(tok2); recoveryRestoreCommand = pstrdup(tok2);
ereport(LOG, ereport(LOG,
(errmsg("restore_command = \"%s\"", (errmsg("restore_command = '%s'",
recoveryRestoreCommand))); recoveryRestoreCommand)));
} }
else if (strcmp(tok1, "recovery_target_timeline") == 0) else if (strcmp(tok1, "recovery_target_timeline") == 0)
...@@ -4435,7 +4435,7 @@ readRecoveryCommandFile(void) ...@@ -4435,7 +4435,7 @@ readRecoveryCommandFile(void)
ObjectIdGetDatum(InvalidOid), ObjectIdGetDatum(InvalidOid),
Int32GetDatum(-1))); Int32GetDatum(-1)));
ereport(LOG, ereport(LOG,
(errmsg("recovery_target_time = %s", (errmsg("recovery_target_time = '%s'",
timestamptz_to_str(recoveryTargetTime)))); timestamptz_to_str(recoveryTargetTime))));
} }
else if (strcmp(tok1, "recovery_target_inclusive") == 0) else if (strcmp(tok1, "recovery_target_inclusive") == 0)
...@@ -4504,7 +4504,7 @@ readRecoveryCommandFile(void) ...@@ -4504,7 +4504,7 @@ readRecoveryCommandFile(void)
/* Timeline 1 does not have a history file, all else should */ /* Timeline 1 does not have a history file, all else should */
if (rtli != 1 && !existsTimeLineHistory(rtli)) if (rtli != 1 && !existsTimeLineHistory(rtli))
ereport(FATAL, ereport(FATAL,
(errmsg("recovery_target_timeline %u does not exist", (errmsg("recovery target timeline %u does not exist",
rtli))); rtli)));
recoveryTargetTLI = rtli; recoveryTargetTLI = rtli;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment