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

Commit 87f4a26

Browse files
committed
Improve wording of error message when a postgresql.conf setting is
ignored because it can only be set at server start. In particular, hiding the main reason in the detail message was suboptimal.
1 parent 41a40fe commit 87f4a26

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/backend/utils/misc/guc-file.l

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright (c) 2000-2009, PostgreSQL Global Development Group
66
*
7-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.60 2009/09/17 20:54:03 petere Exp $
7+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.61 2009/09/17 21:15:18 petere Exp $
88
*/
99

1010
%{
@@ -260,9 +260,8 @@ ProcessConfigFile(GucContext context)
260260
{
261261
ereport(elevel,
262262
(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
263-
errmsg("attempted change of parameter \"%s\" ignored",
264-
gconf->name),
265-
errdetail("This parameter cannot be changed after server start.")));
263+
errmsg("parameter \"%s\" cannot be changed without restarting the server",
264+
gconf->name)));
266265
continue;
267266
}
268267

src/backend/utils/misc/guc.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.517 2009/09/11 19:17:03 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.518 2009/09/17 21:15:18 petere Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -4599,18 +4599,16 @@ set_config_option(const char *name, const char *value,
45994599
if (changeVal && !is_newvalue_equal(record, value))
46004600
ereport(elevel,
46014601
(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
4602-
errmsg("attempted change of parameter \"%s\" ignored",
4603-
name),
4604-
errdetail("This parameter cannot be changed after server start.")));
4602+
errmsg("parameter \"%s\" cannot be changed without restarting the server",
4603+
name)));
46054604
return true;
46064605
}
46074606
if (context != PGC_POSTMASTER)
46084607
{
46094608
ereport(elevel,
46104609
(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
4611-
errmsg("attempted change of parameter \"%s\" ignored",
4612-
name),
4613-
errdetail("This parameter cannot be changed after server start.")));
4610+
errmsg("parameter \"%s\" cannot be changed without restarting the server",
4611+
name)));
46144612
return false;
46154613
}
46164614
break;

0 commit comments

Comments
 (0)