mirror of
https://github.com/postgres/postgres.git
synced 2025-07-18 17:42:25 +03:00
Disallow setting client_min_messages higher than ERROR.
Previously it was possible to set client_min_messages to FATAL or PANIC, which had the effect of suppressing transmission of regular ERROR messages to the client. Perhaps that seemed like a useful option in the past, but the trouble with it is that it breaks guarantees that are explicitly made in our FE/BE protocol spec about how a query cycle can end. While libpq and psql manage to cope with the omission, that's mostly because they are not very bright; client libraries that have more semantic knowledge are likely to get confused. Notably, pgODBC doesn't behave very sanely. Let's fix this by getting rid of the ability to set client_min_messages above ERROR. In HEAD, just remove the FATAL and PANIC options from the set of allowed enum values for client_min_messages. (This change also affects trace_recovery_messages, but that's OK since these aren't useful values for that variable either.) In the back branches, there was concern that rejecting these values might break applications that are explicitly setting things that way. I'm pretty skeptical of that argument, but accommodate it by accepting these values and then internally setting the variable to ERROR anyway. In all branches, this allows a couple of tiny simplifications in the logic in elog.c, so do that. Also respond to the point that was made that client_min_messages has exactly nothing to do with the server's logging behavior, and therefore does not belong in the "When To Log" subsection of the documentation. The "Statement Behavior" subsection is a better match, so move it there. Jonah Harris and Tom Lane Discussion: https://postgr.es/m/7809.1541521180@sss.pgh.pa.us Discussion: https://postgr.es/m/15479-ef0f4cc2fd995ca2@postgresql.org
This commit is contained in:
@ -215,7 +215,8 @@ static const struct config_enum_entry bytea_output_options[] = {
|
||||
|
||||
/*
|
||||
* We have different sets for client and server message level options because
|
||||
* they sort slightly different (see "log" level)
|
||||
* they sort slightly different (see "log" level), and because "fatal"/"panic"
|
||||
* aren't sensible for client_min_messages.
|
||||
*/
|
||||
static const struct config_enum_entry client_message_level_options[] = {
|
||||
{"debug5", DEBUG5, false},
|
||||
@ -229,8 +230,6 @@ static const struct config_enum_entry client_message_level_options[] = {
|
||||
{"notice", NOTICE, false},
|
||||
{"warning", WARNING, false},
|
||||
{"error", ERROR, false},
|
||||
{"fatal", FATAL, true},
|
||||
{"panic", PANIC, true},
|
||||
{NULL, 0, false}
|
||||
};
|
||||
|
||||
@ -3924,7 +3923,7 @@ static struct config_enum ConfigureNamesEnum[] =
|
||||
},
|
||||
|
||||
{
|
||||
{"client_min_messages", PGC_USERSET, LOGGING_WHEN,
|
||||
{"client_min_messages", PGC_USERSET, CLIENT_CONN_STATEMENT,
|
||||
gettext_noop("Sets the message levels that are sent to the client."),
|
||||
gettext_noop("Each level includes all the levels that follow it. The later"
|
||||
" the level, the fewer messages are sent.")
|
||||
|
Reference in New Issue
Block a user