database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Rename server_min_messages to log_min_messages. Part of consolidation

Browse Source 
of log_ settings.
This commit is contained in:
Bruce Momjian
2002-11-14 23:53:27 +00:00
parent 3e8c4c7a73
commit 001d5a7aa5
10 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/plpgsql.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.9 2002/11/10 00:35:58 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.10 2002/11/14 23:53:26 momjian Exp $
--> -->
<chapter id="plpgsql"> <chapter id="plpgsql">
@ -1900,7 +1900,7 @@ RAISE <replaceable class="parameter">level</replaceable> '<replaceable class="pa
(raise an error and abort the current transaction). Whether error (raise an error and abort the current transaction). Whether error
messages of a particular priority are reported to the client, messages of a particular priority are reported to the client,
written to the server log, or both is controlled by the written to the server log, or both is controlled by the
<option>SERVER_MIN_MESSAGES</option> and <option>LOG_MIN_MESSAGES</option> and
<option>CLIENT_MIN_MESSAGES</option> configuration variables. See <option>CLIENT_MIN_MESSAGES</option> configuration variables. See
the <citetitle>PostgreSQL Administrator's Guide</citetitle> for more the <citetitle>PostgreSQL Administrator's Guide</citetitle> for more
information. information.

57
doc/src/sgml/runtime.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.150 2002/11/11 20:14:03 petere Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.151 2002/11/14 23:53:26 momjian Exp $
--> -->
<Chapter Id="runtime"> <Chapter Id="runtime">
@ -854,18 +854,17 @@ env PGOPTIONS='-c geqo=off' psql
<para> <para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><varname>SERVER_MIN_MESSAGES</varname> (<type>string</type>)</term> <term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem> <listitem>
<para> <para>
This controls how much message detail is written to the server This controls how much message detail is written to the
logs. Valid values are <literal>DEBUG5</>, client. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>, <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>, <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
<literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>, <literal>WARNING</>, and <literal>ERROR</>. Later values send
<literal>FATAL</>, and <literal>PANIC</>. Later values send less information to the client. The default is
less detail to the logs. The default is <literal>NOTICE</>. <literal>NOTICE</>. Note that <literal>LOG</> has a different
Note that <literal>LOG</> has a different precedence here than precedence here than in <literal>LOG_MIN_MESSAGES</>.
in <literal>CLIENT_MIN_MESSAGES</>.
</para> </para>
<para> <para>
@ -952,23 +951,6 @@ env PGOPTIONS='-c geqo=off' psql
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
This controls how much message detail is written to the
client. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
<literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
<literal>WARNING</>, and <literal>ERROR</>. Later values send
less information to the client. The default is
<literal>NOTICE</>. Note that <literal>LOG</> has a different
precedence here than in <literal>SERVER_MIN_MESSAGES</>. Also
see that section for an explanation of the various values.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term> <term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term>
<listitem> <listitem>
@ -1076,6 +1058,25 @@ env PGOPTIONS='-c geqo=off' psql
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>LOG_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
This controls how much message detail is written to the server
logs. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
<literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
<literal>FATAL</>, and <literal>PANIC</>. Later values send
less detail to the logs. The default is <literal>NOTICE</>.
Note that <literal>LOG</> has a different precedence here than
in <literal>CLIENT_MIN_MESSAGES</>. Also see that section
for an explanation of the various values.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>LOG_PID</varname> (<type>boolean</type>)</term> <term><varname>LOG_PID</varname> (<type>boolean</type>)</term>
<listitem> <listitem>
@ -2177,7 +2178,7 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
</row> </row>
<row> <row>
<entry><option>-d <replaceable>x</replaceable></option></entry> <entry><option>-d <replaceable>x</replaceable></option></entry>
<entry><literal>server_min_messages = DEBUG<replaceable>x</replaceable></></entry> <entry><literal>log_min_messages = DEBUG<replaceable>x</replaceable></></entry>
</row> </row>
<row> <row>
<entry><option>-F</option></entry> <entry><option>-F</option></entry>

4
src/backend/bootstrap/bootstrap.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.144 2002/09/26 22:58:33 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.145 2002/11/14 23:53:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -263,7 +263,7 @@ BootstrapMain(int argc, char *argv[])
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1); char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg); sprintf(debugstr, "debug%s", optarg);
SetConfigOption("server_min_messages", debugstr, SetConfigOption("log_min_messages", debugstr,
PGC_POSTMASTER, PGC_S_ARGV); PGC_POSTMASTER, PGC_S_ARGV);
SetConfigOption("client_min_messages", debugstr, SetConfigOption("client_min_messages", debugstr,
PGC_POSTMASTER, PGC_S_ARGV); PGC_POSTMASTER, PGC_S_ARGV);

4
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.293 2002/11/13 00:39:47 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.294 2002/11/14 23:53:27 momjian Exp $
* *
* NOTES * NOTES
* *
@ -451,7 +451,7 @@ PostmasterMain(int argc, char *argv[])
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1); char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg); sprintf(debugstr, "debug%s", optarg);
SetConfigOption("server_min_messages", debugstr, SetConfigOption("log_min_messages", debugstr,
PGC_POSTMASTER, PGC_S_ARGV); PGC_POSTMASTER, PGC_S_ARGV);
pfree(debugstr); pfree(debugstr);
debug_flag = atoi(optarg); debug_flag = atoi(optarg);

10
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.307 2002/10/31 21:34:16 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.308 2002/11/14 23:53:27 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -1339,7 +1339,7 @@ PostgresMain(int argc, char *argv[], const char *username)
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1); char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg); sprintf(debugstr, "debug%s", optarg);
SetConfigOption("server_min_messages", debugstr, ctx, gucsource); SetConfigOption("log_min_messages", debugstr, ctx, gucsource);
pfree(debugstr); pfree(debugstr);
} }
@ -1349,7 +1349,7 @@ PostgresMain(int argc, char *argv[], const char *username)
* from propagating to backend. It would be nice * from propagating to backend. It would be nice
* to set it to the postgresql.conf value here. * to set it to the postgresql.conf value here.
*/ */
SetConfigOption("server_min_messages", "notice", SetConfigOption("log_min_messages", "notice",
ctx, gucsource); ctx, gucsource);
} }
break; break;
@ -1590,7 +1590,7 @@ PostgresMain(int argc, char *argv[], const char *username)
/* /*
* -d is not the same as setting * -d is not the same as setting
* server_min_messages because it enables other * log_min_messages because it enables other
* output options. * output options.
*/ */
if (debug_flag >= 1) if (debug_flag >= 1)
@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.307 $ $Date: 2002/10/31 21:34:16 $\n"); puts("$Revision: 1.308 $ $Date: 2002/11/14 23:53:27 $\n");
} }
/* /*

10
src/backend/utils/error/elog.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 */ /* Complicated because LOG is sorted out-of-order for this purpose */
if (lev == LOG || lev == COMMERROR) if (lev == LOG || lev == COMMERROR)
{ {
if (server_min_messages == LOG) if (log_min_messages == LOG)
output_to_server = true; output_to_server = true;
else if (server_min_messages < FATAL) else if (log_min_messages < FATAL)
output_to_server = true; output_to_server = true;
} }
else else
{ {
/* lev != LOG */ /* lev != LOG */
if (server_min_messages == LOG) if (log_min_messages == LOG)
{ {
if (lev >= FATAL) if (lev >= FATAL)
output_to_server = true; output_to_server = true;
} }
/* Neither is LOG */ /* Neither is LOG */
else if (lev >= server_min_messages) else if (lev >= log_min_messages)
output_to_server = true; output_to_server = true;
} }

16
src/backend/utils/misc/guc.c
View File

@ -5,7 +5,7 @@
* command, configuration file, and command line options. * command, configuration file, and command line options.
* See src/backend/utils/misc/README for more information. * 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 * Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>. * 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; char *log_min_error_statement_str = NULL;
const char log_min_error_statement_str_default[] = "panic"; const char log_min_error_statement_str_default[] = "panic";
int server_min_messages = NOTICE; int log_min_messages = NOTICE;
char *server_min_messages_str = NULL; char *log_min_messages_str = NULL;
const char server_min_messages_str_default[] = "notice"; const char log_min_messages_str_default[] = "notice";
int client_min_messages = NOTICE; int client_min_messages = NOTICE;
char *client_min_messages_str = NULL; char *client_min_messages_str = NULL;
@ -805,8 +805,8 @@ static struct config_string
}, },
{ {
{"server_min_messages", PGC_USERSET}, &server_min_messages_str, {"log_min_messages", PGC_USERSET}, &log_min_messages_str,
server_min_messages_str_default, assign_server_min_messages, NULL log_min_messages_str_default, assign_log_min_messages, NULL
}, },
{ {
@ -2927,10 +2927,10 @@ GUCArrayDelete(ArrayType *array, const char *name)
} }
const char * const char *
assign_server_min_messages(const char *newval, assign_log_min_messages(const char *newval,
bool doit, bool interactive) bool doit, bool interactive)
{ {
return (assign_msglvl(&server_min_messages, newval, doit, interactive)); return (assign_msglvl(&log_min_messages, newval, doit, interactive));
} }
const char * const char *

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

@ -112,7 +112,7 @@
# #
# Message display # 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, # debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, log, fatal, # info, notice, warning, error, log, fatal,
# panic # panic

4
src/bin/psql/tab-complete.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000-2002 by PostgreSQL Global Development Group * Copyright 2000-2002 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.65 2002/11/08 17:37:52 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.66 2002/11/14 23:53:27 momjian Exp $
*/ */
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -229,7 +229,7 @@ psql_completion(char *text, int start, int end)
"enable_hashjoin", "enable_hashjoin",
"geqo", "geqo",
"fsync", "fsync",
"server_min_messages", "log_min_messages",
"client_min_messages", "client_min_messages",
"debug_assertions", "debug_assertions",
"log_statement", "log_statement",

10
src/include/utils/guc.h
View File

@ -4,7 +4,7 @@
* External declarations pertaining to backend/utils/misc/guc.c and * External declarations pertaining to backend/utils/misc/guc.c and
* backend/utils/misc/guc-file.l * backend/utils/misc/guc-file.l
* *
* $Id: guc.h,v 1.24 2002/10/21 18:57:35 petere Exp $ * $Id: guc.h,v 1.25 2002/11/14 23:53:27 momjian Exp $
*/ */
#ifndef GUC_H #ifndef GUC_H
#define GUC_H #define GUC_H
@ -103,7 +103,7 @@ extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
extern const char *assign_min_error_statement(const char *newval, bool doit, extern const char *assign_min_error_statement(const char *newval, bool doit,
bool interactive); bool interactive);
extern const char *assign_server_min_messages(const char *newval, extern const char *assign_log_min_messages(const char *newval,
bool doit, bool interactive); bool doit, bool interactive);
extern const char *assign_client_min_messages(const char *newval, extern const char *assign_client_min_messages(const char *newval,
bool doit, bool interactive); bool doit, bool interactive);
@ -129,9 +129,9 @@ extern int log_min_error_statement;
extern char *log_min_error_statement_str; extern char *log_min_error_statement_str;
extern const char log_min_error_statement_str_default[]; extern const char log_min_error_statement_str_default[];
extern int server_min_messages; extern int log_min_messages;
extern char *server_min_messages_str; extern char *log_min_messages_str;
extern const char server_min_messages_str_default[]; extern const char log_min_messages_str_default[];
extern int client_min_messages; extern int client_min_messages;
extern char *client_min_messages_str; extern char *client_min_messages_str;