upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-04-22 22:59:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup for log_min_messages changes in 38e0190ced

Browse source 
* Remove an unused variable
* Use "default log level" consistently (instead of "generic")
* Keep the process types in alphabetical order (missed one place in the
  SGML docs)
* Since log_min_messages type was changed from enum to string, it
  is a good idea to add single quotes when printing it out.  Otherwise
  it fails if the user copies and pastes from the SHOW output to SET,
  except in the simplest case.  Using single quotes reduces confusion.
* Use lowercase string for the burned-in default value, to keep the same
  output as previous versions.

Author: Euler Taveira <euler@eulerto.com>
Author: Man Zeng <zengman@halodbtech.com>
Author: Noriyoshi Shinoda <noriyoshi.shinoda@hpe.com>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://postgr.es/m/202602091250.genyflm2d5dw@alvherre.pgsql
This commit is contained in:
Álvaro Herrera 2026-02-11 16:38:18 +01:00
parent 7984ce7a1d
commit 1efdd7cc63
No known key found for this signature in database
GPG key ID: 1C20ACB9D5C564AE
6 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/src/sgml/config.sgml
View file

@ -7145,9 +7145,9 @@ local0.* /var/log/postgresql
<member><literal>checkpointer</literal></member>
<member><literal>ioworker</literal></member>
<member><literal>postmaster</literal></member>
<member><literal>syslogger</literal></member>
<member><literal>slotsyncworker</literal></member>
<member><literal>startup</literal></member>
<member><literal>syslogger</literal></member>
<member><literal>walreceiver</literal></member>
<member><literal>walsender</literal></member>
<member><literal>walsummarizer</literal></member>

14
src/backend/utils/error/elog.c
View file

@ -2190,7 +2190,7 @@ check_log_min_messages(char **newval, void **extra, GucSource source)
char *result;
int newlevel[BACKEND_NUM_TYPES];
bool assigned[BACKEND_NUM_TYPES] = {0};
int genericlevel = -1; /* -1 means not assigned */
int defaultlevel = -1; /* -1 means not assigned */
const char *const process_types[] = {
#define PG_PROCTYPE(bktype, bkcategory, description, main_func, shmem_attach) \
@ -2228,8 +2228,8 @@ check_log_min_messages(char **newval, void **extra, GucSource source)
const struct config_enum_entry *entry;
bool found;
/* Reject duplicates for generic log level. */
if (genericlevel != -1)
/* Reject duplicates for default log level. */
if (defaultlevel != -1)
{
GUC_check_errdetail("Redundant specification of default log level.");
goto lmm_fail;
@ -2241,7 +2241,7 @@ check_log_min_messages(char **newval, void **extra, GucSource source)
{
if (pg_strcasecmp(entry->name, elem) == 0)
{
genericlevel = entry->val;
defaultlevel = entry->val;
found = true;
break;
}
@ -2331,9 +2331,9 @@ lmm_fail:
}
/*
* The generic log level must be specified. It is the fallback value.
* The default log level must be specified. It is the fallback value.
*/
if (genericlevel == -1)
if (defaultlevel == -1)
{
GUC_check_errdetail("Default log level was not defined.");
guc_free(rawstring);
@ -2345,7 +2345,7 @@ lmm_fail:
for (int i = 0; i < BACKEND_NUM_TYPES; i++)
{
if (!assigned[i])
newlevel[i] = genericlevel;
newlevel[i] = defaultlevel;
}
/*

2
src/backend/utils/misc/guc_parameters.dat
View file

@ -1698,7 +1698,7 @@
long_desc => 'Each level includes all the levels that follow it. The later the level, the fewer messages are sent.',
flags => 'GUC_LIST_INPUT',
variable => 'log_min_messages_string',
boot_val => '"WARNING"',
boot_val => '"warning"',
check_hook => 'check_log_min_messages',
assign_hook => 'assign_log_min_messages',
},

2
src/backend/utils/misc/postgresql.conf.sample
View file

@ -532,7 +532,7 @@
# - When to Log -
#log_min_messages = warning # comma-separated list of
#log_min_messages = 'warning' # comma-separated list of
# process_type:level entries, plus
# one freestanding level as default.
# Valid process types are:

2
src/include/postmaster/proctypelist.h
View file

@ -26,7 +26,7 @@
/*
* List of process types (symbol, category, description, Main function,
* shmem_attach, message level) entries.
* shmem_attach) entries.
*/

2
src/include/utils/guc.h
View file

@ -329,8 +329,6 @@ extern PGDLLIMPORT bool trace_sort;
extern PGDLLIMPORT bool optimize_bounded_sort;
#endif
extern PGDLLIMPORT const char *const log_min_messages_process_types[];
/*
* Declarations for options for enum values
*