diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-09-17 21:15:18 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-09-17 21:15:18 +0000 |
| commit | 87f4a26e5d592bdeeb877c1acf108e5ecdf7c9bc (patch) | |
| tree | c9873ad5a6a7e9d32cdf174d932642eb920a2d3a | |
| parent | 41a40fe4a2acc1256556754228a650610dbffa42 (diff) | |
| download | postgresql-87f4a26e5d592bdeeb877c1acf108e5ecdf7c9bc.tar.gz postgresql-87f4a26e5d592bdeeb877c1acf108e5ecdf7c9bc.zip | |
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.
| -rw-r--r-- | src/backend/utils/misc/guc-file.l | 7 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index 3bd466b240c..a425cd48ac0 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -4,7 +4,7 @@ * * Copyright (c) 2000-2009, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.60 2009/09/17 20:54:03 petere Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.61 2009/09/17 21:15:18 petere Exp $ */ %{ @@ -260,9 +260,8 @@ ProcessConfigFile(GucContext context) { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("attempted change of parameter \"%s\" ignored", - gconf->name), - errdetail("This parameter cannot be changed after server start."))); + errmsg("parameter \"%s\" cannot be changed without restarting the server", + gconf->name))); continue; } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index cfa71e0cc11..17bbbd7cb4a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.517 2009/09/11 19:17:03 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.518 2009/09/17 21:15:18 petere Exp $ * *-------------------------------------------------------------------- */ @@ -4599,18 +4599,16 @@ set_config_option(const char *name, const char *value, if (changeVal && !is_newvalue_equal(record, value)) ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("attempted change of parameter \"%s\" ignored", - name), - errdetail("This parameter cannot be changed after server start."))); + errmsg("parameter \"%s\" cannot be changed without restarting the server", + name))); return true; } if (context != PGC_POSTMASTER) { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("attempted change of parameter \"%s\" ignored", - name), - errdetail("This parameter cannot be changed after server start."))); + errmsg("parameter \"%s\" cannot be changed without restarting the server", + name))); return false; } break; |