Commit03302fd

committed

Improve wording of error message when a postgresql.conf setting is

ignored because it can only be set at server start.

1 parentbd3dadd commit03302fdCopy full SHA for 03302fd

File tree

+11

-8

lines changed

+11

-8

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Copyright (c) 2000-2008, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.55 2008/05/09 15:36:31 petere Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.56 2008/08/22 00:20:40 momjian Exp $`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`%{`
`@@ -258,8 +258,9 @@ ProcessConfigFile(GucContext context)`
`258`	`258`	`{`
`259`	`259`	`ereport(elevel,`
`260`	`260`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`261`		`-errmsg("parameter\"%s\" cannot be changed after server start; configuration file change ignored",`
`262`		`-gconf->name)));`
	`261`	`+errmsg("attempted change of parameter\"%s\" ignored",`
	`262`	`+gconf->name),`
	`263`	`+errdetail("This parameter cannot be changed after server start.")));`
`263`	`264`	`continue;`
`264`	`265`	`}`
`265`	`266`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.467 2008/08/19 18:30:04 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.468 2008/08/22 00:20:40 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -4598,16 +4598,18 @@ set_config_option(const char name, const char value,`
`4598`	`4598`	`if (changeVal&& !is_newvalue_equal(record,value))`
`4599`	`4599`	`ereport(elevel,`
`4600`	`4600`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`4601`		`-errmsg("parameter \"%s\" cannot be changed after server start; configuration file change ignored",`
`4602`		`-name)));`
	`4601`	`+errmsg("attempted change of parameter \"%s\" ignored",`
	`4602`	`+name),`
	`4603`	`+errdetail("This parameter cannot be changed after server start.")));`
`4603`	`4604`	`return true;`
`4604`	`4605`	`}`
`4605`	`4606`	`if (context!=PGC_POSTMASTER)`
`4606`	`4607`	`{`
`4607`	`4608`	`ereport(elevel,`
`4608`	`4609`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`4609`		`-errmsg("parameter \"%s\" cannot be changed after server start",`
`4610`		`-name)));`
	`4610`	`+errmsg("attempted change of parameter \"%s\" ignored",`
	`4611`	`+name),`
	`4612`	`+errdetail("This parameter cannot be changed after server start.")));`
`4611`	`4613`	`return false;`
`4612`	`4614`	`}`
`4613`	`4615`	`break;`

Comments

(0)