1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00

Change a couple of ill-advised uses of INFO elog level to WARNINGs; in

particular this allows EmitWarningsOnPlaceholders messages to show up in the
postmaster log by default.  Update elog.h comment to make it clearer what INFO
is for, and fix one example in the SGML docs that was misusing it.  Per my
gripe of yesterday.
This commit is contained in:
Tom Lane
2009-01-06 16:39:52 +00:00
parent 229bffedbc
commit 7c63d0c72e
3 changed files with 20 additions and 21 deletions

View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.489 2009/01/05 13:23:33 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.490 2009/01/06 16:39:52 tgl Exp $
*
*--------------------------------------------------------------------
*/
@ -4541,7 +4541,7 @@ set_config_option(const char *name, const char *value,
elevel = IsUnderPostmaster ? DEBUG3 : LOG;
}
else if (source == PGC_S_DATABASE || source == PGC_S_USER)
elevel = INFO;
elevel = WARNING;
else
elevel = ERROR;
@ -5904,22 +5904,21 @@ DefineCustomEnumVariable(const char *name,
void
EmitWarningsOnPlaceholders(const char *className)
{
struct config_generic **vars = guc_variables;
struct config_generic **last = vars + num_guc_variables;
int classLen = strlen(className);
int i;
int nameLen = strlen(className);
while (vars < last)
for (i = 0; i < num_guc_variables; i++)
{
struct config_generic *var = *vars++;
struct config_generic *var = guc_variables[i];
if ((var->flags & GUC_CUSTOM_PLACEHOLDER) != 0 &&
strncmp(className, var->name, nameLen) == 0 &&
var->name[nameLen] == GUC_QUALIFIER_SEPARATOR)
strncmp(className, var->name, classLen) == 0 &&
var->name[classLen] == GUC_QUALIFIER_SEPARATOR)
{
ereport(INFO,
ereport(WARNING,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("unrecognized configuration parameter \"%s\"", var->name)));
errmsg("unrecognized configuration parameter \"%s\"",
var->name)));
}
}
}
@ -5952,7 +5951,6 @@ GetPGVariableResultDesc(const char *name)
TEXTOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 3, "description",
TEXTOID, -1, 0);
}
else
{