Skip to content

Commit 001d5a7

Browse files
bmomjianbmomjian
committed
Rename server_min_messages to log_min_messages. Part of consolidation
of log_ settings.
1 parent 3e8c4c7 commit 001d5a7

File tree

10 files changed

+61
-60
lines changed

10 files changed

+61
-60
lines changed

‎doc/src/sgml/plpgsql.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.9 2002/11/10 00:35:58 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.10 2002/11/14 23:53:26 momjian Exp $
33
-->
44

55
<chapter id="plpgsql">
@@ -1900,7 +1900,7 @@ RAISE <replaceable class="parameter">level</replaceable> '<replaceable class="pa
19001900
(raise an error and abort the current transaction). Whether error
19011901
messages of a particular priority are reported to the client,
19021902
written to the server log, or both is controlled by the
1903-
<option>SERVER_MIN_MESSAGES</option> and
1903+
<option>LOG_MIN_MESSAGES</option> and
19041904
<option>CLIENT_MIN_MESSAGES</option> configuration variables. See
19051905
the <citetitle>PostgreSQL Administrator's Guide</citetitle> for more
19061906
information.

‎doc/src/sgml/runtime.sgml

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.150 2002/11/11 20:14:03 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.151 2002/11/14 23:53:26 momjian Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -854,18 +854,17 @@ env PGOPTIONS='-c geqo=off' psql
854854
<para>
855855
<variablelist>
856856
<varlistentry>
857-
<term><varname>SERVER_MIN_MESSAGES</varname> (<type>string</type>)</term>
857+
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
858858
<listitem>
859859
<para>
860-
This controls how much message detail is written to the server
861-
logs. Valid values are <literal>DEBUG5</>,
860+
This controls how much message detail is written to the
861+
client. Valid values are <literal>DEBUG5</>,
862862
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
863-
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
864-
<literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
865-
<literal>FATAL</>, and <literal>PANIC</>. Later values send
866-
less detail to the logs. The default is <literal>NOTICE</>.
867-
Note that <literal>LOG</> has a different precedence here than
868-
in <literal>CLIENT_MIN_MESSAGES</>.
863+
<literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
864+
<literal>WARNING</>, and <literal>ERROR</>. Later values send
865+
less information to the client. The default is
866+
<literal>NOTICE</>. Note that <literal>LOG</> has a different
867+
precedence here than in <literal>LOG_MIN_MESSAGES</>.
869868
</para>
870869

871870
<para>
@@ -952,23 +951,6 @@ env PGOPTIONS='-c geqo=off' psql
952951
</listitem>
953952
</varlistentry>
954953

955-
<varlistentry>
956-
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
957-
<listitem>
958-
<para>
959-
This controls how much message detail is written to the
960-
client. Valid values are <literal>DEBUG5</>,
961-
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
962-
<literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
963-
<literal>WARNING</>, and <literal>ERROR</>. Later values send
964-
less information to the client. The default is
965-
<literal>NOTICE</>. Note that <literal>LOG</> has a different
966-
precedence here than in <literal>SERVER_MIN_MESSAGES</>. Also
967-
see that section for an explanation of the various values.
968-
</para>
969-
</listitem>
970-
</varlistentry>
971-
972954
<varlistentry>
973955
<term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term>
974956
<listitem>
@@ -1076,6 +1058,25 @@ env PGOPTIONS='-c geqo=off' psql
10761058
</listitem>
10771059
</varlistentry>
10781060

1061+
<varlistentry>
1062+
<term><varname>LOG_MIN_MESSAGES</varname> (<type>string</type>)</term>
1063+
<listitem>
1064+
<para>
1065+
This controls how much message detail is written to the server
1066+
logs. Valid values are <literal>DEBUG5</>,
1067+
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
1068+
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
1069+
<literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
1070+
<literal>FATAL</>, and <literal>PANIC</>. Later values send
1071+
less detail to the logs. The default is <literal>NOTICE</>.
1072+
Note that <literal>LOG</> has a different precedence here than
1073+
in <literal>CLIENT_MIN_MESSAGES</>. Also see that section
1074+
for an explanation of the various values.
1075+
</para>
1076+
1077+
</listitem>
1078+
</varlistentry>
1079+
10791080
<varlistentry>
10801081
<term><varname>LOG_PID</varname> (<type>boolean</type>)</term>
10811082
<listitem>
@@ -2177,7 +2178,7 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
21772178
</row>
21782179
<row>
21792180
<entry><option>-d <replaceable>x</replaceable></option></entry>
2180-
<entry><literal>server_min_messages = DEBUG<replaceable>x</replaceable></></entry>
2181+
<entry><literal>log_min_messages = DEBUG<replaceable>x</replaceable></></entry>
21812182
</row>
21822183
<row>
21832184
<entry><option>-F</option></entry>

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.144 2002/09/26 22:58:33 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.145 2002/11/14 23:53:27 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -263,7 +263,7 @@ BootstrapMain(int argc, char *argv[])
263263
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
264264

265265
sprintf(debugstr, "debug%s", optarg);
266-
SetConfigOption("server_min_messages", debugstr,
266+
SetConfigOption("log_min_messages", debugstr,
267267
PGC_POSTMASTER, PGC_S_ARGV);
268268
SetConfigOption("client_min_messages", debugstr,
269269
PGC_POSTMASTER, PGC_S_ARGV);

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.293 2002/11/13 00:39:47 momjian Exp $
40+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.294 2002/11/14 23:53:27 momjian Exp $
4141
*
4242
* NOTES
4343
*
@@ -451,7 +451,7 @@ PostmasterMain(int argc, char *argv[])
451451
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
452452

453453
sprintf(debugstr, "debug%s", optarg);
454-
SetConfigOption("server_min_messages", debugstr,
454+
SetConfigOption("log_min_messages", debugstr,
455455
PGC_POSTMASTER, PGC_S_ARGV);
456456
pfree(debugstr);
457457
debug_flag = atoi(optarg);

‎src/backend/tcop/postgres.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.307 2002/10/31 21:34:16 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.308 2002/11/14 23:53:27 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -1339,7 +1339,7 @@ PostgresMain(int argc, char *argv[], const char *username)
13391339
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
13401340

13411341
sprintf(debugstr, "debug%s", optarg);
1342-
SetConfigOption("server_min_messages", debugstr, ctx, gucsource);
1342+
SetConfigOption("log_min_messages", debugstr, ctx, gucsource);
13431343
pfree(debugstr);
13441344

13451345
}
@@ -1349,7 +1349,7 @@ PostgresMain(int argc, char *argv[], const char *username)
13491349
* from propagating to backend. It would be nice
13501350
* to set it to the postgresql.conf value here.
13511351
*/
1352-
SetConfigOption("server_min_messages", "notice",
1352+
SetConfigOption("log_min_messages", "notice",
13531353
ctx, gucsource);
13541354
}
13551355
break;
@@ -1590,7 +1590,7 @@ PostgresMain(int argc, char *argv[], const char *username)
15901590

15911591
/*
15921592
* -d is not the same as setting
1593-
* server_min_messages because it enables other
1593+
* log_min_messages because it enables other
15941594
* output options.
15951595
*/
15961596
if (debug_flag >= 1)
@@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username)
17811781
if (!IsUnderPostmaster)
17821782
{
17831783
puts("\nPOSTGRES backend interactive interface ");
1784-
puts("$Revision: 1.307 $ $Date: 2002/10/31 21:34:16 $\n");
1784+
puts("$Revision: 1.308 $ $Date: 2002/11/14 23:53:27 $\n");
17851785
}
17861786

17871787
/*

‎src/backend/utils/error/elog.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.104 2002/11/01 17:55:23 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.105 2002/11/14 23:53:27 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -148,21 +148,21 @@ elog(int lev, const char *fmt,...)
148148
/* Complicated because LOG is sorted out-of-order for this purpose */
149149
if (lev == LOG || lev == COMMERROR)
150150
{
151-
if (server_min_messages == LOG)
151+
if (log_min_messages == LOG)
152152
output_to_server = true;
153-
else if (server_min_messages < FATAL)
153+
else if (log_min_messages < FATAL)
154154
output_to_server = true;
155155
}
156156
else
157157
{
158158
/* lev != LOG */
159-
if (server_min_messages == LOG)
159+
if (log_min_messages == LOG)
160160
{
161161
if (lev >= FATAL)
162162
output_to_server = true;
163163
}
164164
/* Neither is LOG */
165-
else if (lev >= server_min_messages)
165+
else if (lev >= log_min_messages)
166166
output_to_server = true;
167167
}
168168

‎src/backend/utils/misc/guc.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* command, configuration file, and command line options.
66
* See src/backend/utils/misc/README for more information.
77
*
8-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.100 2002/11/08 17:37:52 tgl Exp $
8+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.101 2002/11/14 23:53:27 momjian Exp $
99
*
1010
* Copyright 2000 by PostgreSQL Global Development Group
1111
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -105,9 +105,9 @@ int log_min_error_statement = ERROR;
105105
char *log_min_error_statement_str = NULL;
106106
const char log_min_error_statement_str_default[] = "panic";
107107

108-
int server_min_messages = NOTICE;
109-
char *server_min_messages_str = NULL;
110-
const char server_min_messages_str_default[] = "notice";
108+
int log_min_messages = NOTICE;
109+
char *log_min_messages_str = NULL;
110+
const char log_min_messages_str_default[] = "notice";
111111

112112
int client_min_messages = NOTICE;
113113
char *client_min_messages_str = NULL;
@@ -805,8 +805,8 @@ static struct config_string
805805
},
806806

807807
{
808-
{"server_min_messages", PGC_USERSET}, &server_min_messages_str,
809-
server_min_messages_str_default, assign_server_min_messages, NULL
808+
{"log_min_messages", PGC_USERSET}, &log_min_messages_str,
809+
log_min_messages_str_default, assign_log_min_messages, NULL
810810
},
811811

812812
{
@@ -2927,10 +2927,10 @@ GUCArrayDelete(ArrayType *array, const char *name)
29272927
}
29282928

29292929
const char *
2930-
assign_server_min_messages(const char *newval,
2930+
assign_log_min_messages(const char *newval,
29312931
bool doit, bool interactive)
29322932
{
2933-
return (assign_msglvl(&server_min_messages, newval, doit, interactive));
2933+
return (assign_msglvl(&log_min_messages, newval, doit, interactive));
29342934
}
29352935

29362936
const char *

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
#
113113
# Message display
114114
#
115-
#server_min_messages = notice # Values, in order of decreasing detail:
115+
#log_min_messages = notice # Values, in order of decreasing detail:
116116
# debug5, debug4, debug3, debug2, debug1,
117117
# info, notice, warning, error, log, fatal,
118118
# panic

‎src/bin/psql/tab-complete.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000-2002 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.65 2002/11/08 17:37:52 tgl Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.66 2002/11/14 23:53:27 momjian Exp $
77
*/
88

99
/*----------------------------------------------------------------------
@@ -229,7 +229,7 @@ psql_completion(char *text, int start, int end)
229229
"enable_hashjoin",
230230
"geqo",
231231
"fsync",
232-
"server_min_messages",
232+
"log_min_messages",
233233
"client_min_messages",
234234
"debug_assertions",
235235
"log_statement",

‎src/include/utils/guc.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* External declarations pertaining to backend/utils/misc/guc.c and
55
* backend/utils/misc/guc-file.l
66
*
7-
* $Id: guc.h,v 1.24 2002/10/21 18:57:35 petere Exp $
7+
* $Id: guc.h,v 1.25 2002/11/14 23:53:27 momjian Exp $
88
*/
99
#ifndef GUC_H
1010
#define GUC_H
@@ -103,7 +103,7 @@ extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
103103
extern const char *assign_min_error_statement(const char *newval, bool doit,
104104
bool interactive);
105105

106-
extern const char *assign_server_min_messages(const char *newval,
106+
extern const char *assign_log_min_messages(const char *newval,
107107
bool doit, bool interactive);
108108
extern const char *assign_client_min_messages(const char *newval,
109109
bool doit, bool interactive);
@@ -129,9 +129,9 @@ extern int log_min_error_statement;
129129
extern char *log_min_error_statement_str;
130130
extern const char log_min_error_statement_str_default[];
131131

132-
extern int server_min_messages;
133-
extern char *server_min_messages_str;
134-
extern const char server_min_messages_str_default[];
132+
extern int log_min_messages;
133+
extern char *log_min_messages_str;
134+
extern const char log_min_messages_str_default[];
135135

136136
extern int client_min_messages;
137137
extern char *client_min_messages_str;

0 commit comments

Comments
 (0)