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

petere · petere · commit b30769ee54f1 · 2007-11-15T22:02:12.000Z
appear in the configuration file.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * 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)
 		{
 			recoveryRestoreCommand = pstrdup(tok2);
 			ereport(LOG,
-					(errmsg("restore_command = \"%s\"",
+					(errmsg("restore_command = '%s'",
 							recoveryRestoreCommand)));
 		}
 		else if (strcmp(tok1, "recovery_target_timeline") == 0)
@@ -4435,7 +4435,7 @@ readRecoveryCommandFile(void)
 												ObjectIdGetDatum(InvalidOid),
 														Int32GetDatum(-1)));
 			ereport(LOG,
-					(errmsg("recovery_target_time = %s",
+					(errmsg("recovery_target_time = '%s'",
 							timestamptz_to_str(recoveryTargetTime))));
 		}
 		else if (strcmp(tok1, "recovery_target_inclusive") == 0)
@@ -4504,7 +4504,7 @@ readRecoveryCommandFile(void)
 			/* Timeline 1 does not have a history file, all else should */
 			if (rtli != 1 && !existsTimeLineHistory(rtli))
 				ereport(FATAL,
-						(errmsg("recovery_target_timeline %u does not exist",
+						(errmsg("recovery target timeline %u does not exist",
 								rtli)));
 			recoveryTargetTLI = rtli;
 		}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2007, 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.288 2007/11/15 21:14:32 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.289 2007/11/15 22:02:12 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -4377,7 +4377,7 @@ readRecoveryCommandFile(void)`
`4377`	`4377`	`{`
`4378`	`4378`	`recoveryRestoreCommand = pstrdup(tok2);`
`4379`	`4379`	`ereport(LOG,`
`4380`		`- (errmsg("restore_command = \"%s\"",`
	`4380`	`+ (errmsg("restore_command = '%s'",`
`4381`	`4381`	`recoveryRestoreCommand)));`
`4382`	`4382`	`}`
`4383`	`4383`	`else if (strcmp(tok1, "recovery_target_timeline") == 0)`
`@@ -4435,7 +4435,7 @@ readRecoveryCommandFile(void)`
`4435`	`4435`	`ObjectIdGetDatum(InvalidOid),`
`4436`	`4436`	`Int32GetDatum(-1)));`
`4437`	`4437`	`ereport(LOG,`
`4438`		`- (errmsg("recovery_target_time = %s",`
	`4438`	`+ (errmsg("recovery_target_time = '%s'",`
`4439`	`4439`	`timestamptz_to_str(recoveryTargetTime))));`
`4440`	`4440`	`}`
`4441`	`4441`	`else if (strcmp(tok1, "recovery_target_inclusive") == 0)`
`@@ -4504,7 +4504,7 @@ readRecoveryCommandFile(void)`
`4504`	`4504`	`/* Timeline 1 does not have a history file, all else should */`
`4505`	`4505`	`if (rtli != 1 && !existsTimeLineHistory(rtli))`
`4506`	`4506`	`ereport(FATAL,`
`4507`		`- (errmsg("recovery_target_timeline %u does not exist",`
	`4507`	`+ (errmsg("recovery target timeline %u does not exist",`
`4508`	`4508`	`rtli)));`
`4509`	`4509`	`recoveryTargetTLI = rtli;`
`4510`	`4510`	`}`