diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-12-28 00:23:23 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-12-28 00:23:23 +0000 |
| commit | 5233dc15cf08afc0ddece24cc0f308582bf34c18 (patch) | |
| tree | d9dbd78dfae55992bd5e41b8eba69a791219449d /src/backend/tcop/postgres.c | |
| parent | 2e4cb7082ca547d017759996b09cea754ab97bcc (diff) | |
| download | postgresql-5233dc15cf08afc0ddece24cc0f308582bf34c18.tar.gz postgresql-5233dc15cf08afc0ddece24cc0f308582bf34c18.zip | |
Improve consistency of error reporting in GUC assign_hook routines. Some
were reporting ERROR for interactive assignments and LOG for other cases,
some were saying nothing for non-interactive cases, and a few did yet other
things. Make them use a new function GUC_complaint_elevel() to establish
a reasonably uniform policy about how to report. There are still a few
edge cases such as assign_search_path(), but it's much better than before.
Per gripe from Devrim Gunduz and subsequent discussion.
As noted by Alvaro, it'd be better to fold these custom messages into the
standard "invalid parameter value" complaint from guc.c, perhaps as the DETAIL
field. However that will require more redesign than seems prudent for 8.3.
This is a relatively safe, low-impact change that we can afford to risk now.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 8e2ca618a23..51568274053 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.539 2007/12/06 14:32:54 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.540 2007/12/28 00:23:23 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2644,7 +2644,7 @@ assign_max_stack_depth(int newval, bool doit, GucSource source) if (stack_rlimit > 0 && newval_bytes > stack_rlimit - STACK_DEPTH_SLOP) { - ereport((source >= PGC_S_INTERACTIVE) ? ERROR : LOG, + ereport(GUC_complaint_elevel(source), (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("\"max_stack_depth\" must not exceed %ldkB", (stack_rlimit - STACK_DEPTH_SLOP) / 1024L), |