From: Bruce Momjian Date: Fri, 22 Aug 2008 00:20:40 +0000 (+0000) Subject: Improve wording of error message when a postgresql.conf setting is X-Git-Tag: REL9_0_0~3199 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=03302fd9b477334487bc50c1e1f904b06f857082;p=pg-rex%2Fsyncrep.git Improve wording of error message when a postgresql.conf setting is ignored because it can only be set at server start. --- diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index 3a1ee2db4e..a95a35d2f7 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -4,7 +4,7 @@ * * Copyright (c) 2000-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.55 2008/05/09 15:36:31 petere Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.56 2008/08/22 00:20:40 momjian Exp $ */ %{ @@ -258,8 +258,9 @@ ProcessConfigFile(GucContext context) { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("parameter \"%s\" cannot be changed after server start; configuration file change ignored", - gconf->name))); + errmsg("attempted change of parameter \"%s\" ignored", + gconf->name), + errdetail("This parameter cannot be changed after server start."))); continue; } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c9fe269326..dea354187e 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut . * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.467 2008/08/19 18:30:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.468 2008/08/22 00:20:40 momjian Exp $ * *-------------------------------------------------------------------- */ @@ -4598,16 +4598,18 @@ 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("parameter \"%s\" cannot be changed after server start; configuration file change ignored", - name))); + errmsg("attempted change of parameter \"%s\" ignored", + name), + errdetail("This parameter cannot be changed after server start."))); return true; } if (context != PGC_POSTMASTER) { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("parameter \"%s\" cannot be changed after server start", - name))); + errmsg("attempted change of parameter \"%s\" ignored", + name), + errdetail("This parameter cannot be changed after server start."))); return false; } break;