Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cb6038c

Browse files
committed
Fix some inconsistent quoting of wal_level values in messages
When referring to postgresql.conf syntax, then it's without quotes (wal_level=archive); in narrative it's with double quotes. But never single quotes.
1 parent 6674401 commit cb6038c

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/backend/access/transam/xlog.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.416 2010/06/03 03:19:59 rhaas Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.417 2010/06/03 21:02:11 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -5594,8 +5594,8 @@ CheckRequiredParameterValues(void)
55945594
if (InArchiveRecovery && ControlFile->wal_level == WAL_LEVEL_MINIMAL)
55955595
{
55965596
ereport(WARNING,
5597-
(errmsg("WAL was generated with wal_level=\"minimal\", data may be missing"),
5598-
errhint("This happens if you temporarily set wal_level=\"minimal\" without taking a new base backup.")));
5597+
(errmsg("WAL was generated with wal_level=minimal, data may be missing"),
5598+
errhint("This happens if you temporarily set wal_level=minimal without taking a new base backup.")));
55995599
}
56005600

56015601
/*
@@ -7731,9 +7731,9 @@ XLogReportParameters(void)
77317731
/*
77327732
* The change in number of backend slots doesn't need to be
77337733
* WAL-logged if archiving is not enabled, as you can't start
7734-
* archive recovery with wal_level='minimal' anyway. We don't
7734+
* archive recovery with wal_level=minimal anyway. We don't
77357735
* really care about the values in pg_control either if
7736-
* wal_level='minimal', but seems better to keep them up-to-date
7736+
* wal_level=minimal, but seems better to keep them up-to-date
77377737
* to avoid confusion.
77387738
*/
77397739
if (wal_level != ControlFile->wal_level || XLogIsNeeded())

src/backend/postmaster/postmaster.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.610 2010/05/27 02:01:37 rhaas Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.611 2010/06/03 21:02:11 petere Exp $
4141
*
4242
* NOTES
4343
*
@@ -730,10 +730,10 @@ PostmasterMain(int argc, char *argv[])
730730
}
731731
if (XLogArchiveMode && wal_level == WAL_LEVEL_MINIMAL)
732732
ereport(ERROR,
733-
(errmsg("WAL archival (archive_mode='on') requires wal_level 'archive' or 'hot_standby'")));
733+
(errmsg("WAL archival (archive_mode=on) requires wal_level \"archive\" or \"hot_standby\"")));
734734
if (max_wal_senders > 0 && wal_level == WAL_LEVEL_MINIMAL)
735735
ereport(ERROR,
736-
(errmsg("WAL streaming (max_wal_senders > 0) requires wal_level 'archive' or 'hot_standby")));
736+
(errmsg("WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or \"hot_standby\"")));
737737

738738
/*
739739
* Other one-time internal sanity checks can go here, if they are fast.

src/backend/replication/walsender.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
*
3232
* IDENTIFICATION
33-
* $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.23 2010/05/31 10:44:37 heikki Exp $
33+
* $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.24 2010/06/03 21:02:12 petere Exp $
3434
*
3535
*-------------------------------------------------------------------------
3636
*/
@@ -274,7 +274,7 @@ WalSndHandshake(void)
274274
if (wal_level == WAL_LEVEL_MINIMAL)
275275
ereport(FATAL,
276276
(errcode(ERRCODE_CANNOT_CONNECT_NOW),
277-
errmsg("standby connections not allowed because wal_level=\"minimal\"")));
277+
errmsg("standby connections not allowed because wal_level=minimal")));
278278

279279
/* Send a CopyOutResponse message, and start streaming */
280280
pq_beginmessage(&buf, 'H');

0 commit comments

Comments
 (0)