diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/error/elog.c | 10 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 66c17e2e8cc..94abd521b61 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.104 2002/11/01 17:55:23 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.105 2002/11/14 23:53:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -148,21 +148,21 @@ elog(int lev, const char *fmt,...) /* Complicated because LOG is sorted out-of-order for this purpose */ if (lev == LOG || lev == COMMERROR) { - if (server_min_messages == LOG) + if (log_min_messages == LOG) output_to_server = true; - else if (server_min_messages < FATAL) + else if (log_min_messages < FATAL) output_to_server = true; } else { /* lev != LOG */ - if (server_min_messages == LOG) + if (log_min_messages == LOG) { if (lev >= FATAL) output_to_server = true; } /* Neither is LOG */ - else if (lev >= server_min_messages) + else if (lev >= log_min_messages) output_to_server = true; } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index ac1c97fedff..8802e5fbdce 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -5,7 +5,7 @@ * command, configuration file, and command line options. * See src/backend/utils/misc/README for more information. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.100 2002/11/08 17:37:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.101 2002/11/14 23:53:27 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -105,9 +105,9 @@ int log_min_error_statement = ERROR; char *log_min_error_statement_str = NULL; const char log_min_error_statement_str_default[] = "panic"; -int server_min_messages = NOTICE; -char *server_min_messages_str = NULL; -const char server_min_messages_str_default[] = "notice"; +int log_min_messages = NOTICE; +char *log_min_messages_str = NULL; +const char log_min_messages_str_default[] = "notice"; int client_min_messages = NOTICE; char *client_min_messages_str = NULL; @@ -805,8 +805,8 @@ static struct config_string }, { - {"server_min_messages", PGC_USERSET}, &server_min_messages_str, - server_min_messages_str_default, assign_server_min_messages, NULL + {"log_min_messages", PGC_USERSET}, &log_min_messages_str, + log_min_messages_str_default, assign_log_min_messages, NULL }, { @@ -2927,10 +2927,10 @@ GUCArrayDelete(ArrayType *array, const char *name) } const char * -assign_server_min_messages(const char *newval, +assign_log_min_messages(const char *newval, bool doit, bool interactive) { - return (assign_msglvl(&server_min_messages, newval, doit, interactive)); + return (assign_msglvl(&log_min_messages, newval, doit, interactive)); } const char * diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index ee721a358a8..ff72af3c259 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -112,7 +112,7 @@ # # Message display # -#server_min_messages = notice # Values, in order of decreasing detail: +#log_min_messages = notice # Values, in order of decreasing detail: # debug5, debug4, debug3, debug2, debug1, # info, notice, warning, error, log, fatal, # panic |