Commit87f4a26

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 parent41a40fe commit87f4a26Copy full SHA for 87f4a26

File tree

-11

lines changed

-11

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.60 2009/09/1720:54:03 petere Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.61 2009/09/1721:15:18 petere Exp $`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`%{`
`@@ -260,9 +260,8 @@ ProcessConfigFile(GucContext context)`
`260`	`260`	`{`
`261`	`261`	`ereport(elevel,`
`262`	`262`	`(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)));`
`266`	`265`	`continue;`
`267`	`266`	`}`
`268`	`267`

Lines changed: 5 additions & 7 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.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 $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -4599,18 +4599,16 @@ set_config_option(const char name, const char value,`
`4599`	`4599`	`if (changeVal&& !is_newvalue_equal(record,value))`
`4600`	`4600`	`ereport(elevel,`
`4601`	`4601`	`(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)));`
`4605`	`4604`	`return true;`
`4606`	`4605`	`}`
`4607`	`4606`	`if (context!=PGC_POSTMASTER)`
`4608`	`4607`	`{`
`4609`	`4608`	`ereport(elevel,`
`4610`	`4609`	`(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)));`
`4614`	`4612`	`return false;`
`4615`	`4613`	`}`
`4616`	`4614`	`break;`

Comments

(0)