Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit219e297

Browse files
committed
Add GUC option log_error_verbosity to control which fields of error
reports get put into the postmaster log. Options are TERSE, DEFAULT,VERBOSE, with the same behavior as implemented on the client side inlibpq.
1 parenta3cac5a commit219e297

File tree

6 files changed

+141
-64
lines changed

6 files changed

+141
-64
lines changed

‎doc/src/sgml/runtime.sgml‎

Lines changed: 34 additions & 31 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.188 2003/06/27 18:20:50 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.189 2003/06/30 16:47:01 tgl Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -1513,7 +1513,7 @@ SET ENABLE_SEQSCAN TO OFF;
15131513
<title>When To Log</title>
15141514

15151515
<para>
1516-
Here is a list of the various messagetypes:
1516+
Here is a list of the various messageseverity levels:
15171517
<variablelist>
15181518
<varlistentry>
15191519
<term><literal>DEBUG[1-5]</literal></term>
@@ -1596,43 +1596,52 @@ SET ENABLE_SEQSCAN TO OFF;
15961596

15971597
<variablelist>
15981598

1599+
<varlistentry>
1600+
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
1601+
<listitem>
1602+
<para>
1603+
Controls which message levels are sent to the client.
1604+
Valid values are <literal>DEBUG5</>,
1605+
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
1606+
<literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
1607+
<literal>WARNING</>, and <literal>ERROR</>. Each level
1608+
includes all the levels that follow it. The later the level,
1609+
the fewer messages are sent. The default is
1610+
<literal>NOTICE</>. Note that <literal>LOG</> has a different
1611+
rank here than in <literal>LOG_MIN_MESSAGES</>.
1612+
</para>
1613+
</listitem>
1614+
</varlistentry>
1615+
15991616
<varlistentry>
16001617
<term><varname>LOG_MIN_MESSAGES</varname> (<type>string</type>)</term>
16011618
<listitem>
16021619
<para>
1603-
This controlswhich message levels are written to the server
1604-
log.Valid values are <literal>DEBUG5</>, <literal>DEBUG4</>,
1620+
Controlswhich message levels are written to the server log.
1621+
Valid values are <literal>DEBUG5</>, <literal>DEBUG4</>,
16051622
<literal>DEBUG3</>, <literal>DEBUG2</>, <literal>DEBUG1</>,
16061623
<literal>INFO</>, <literal>NOTICE</>, <literal>WARNING</>,
16071624
<literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>, and
16081625
<literal>PANIC</>. Each level includes all the levels that
16091626
follow it. The later the level, the fewer messages are sent
16101627
to the log. The default is <literal>NOTICE</>. Note that
16111628
<literal>LOG</> has a different rank here than in
1612-
<literal>CLIENT_MIN_MESSAGES</>. Also see that section for an
1613-
explanation of the various values.
1629+
<literal>CLIENT_MIN_MESSAGES</>.
16141630
</para>
1615-
16161631
</listitem>
16171632
</varlistentry>
16181633

16191634
<varlistentry>
1620-
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
1635+
<term><varname>LOG_ERROR_VERBOSITY</varname> (<type>string</type>)</term>
16211636
<listitem>
16221637
<para>
1623-
This controls which message levels are send to the client.
1624-
client. Valid values are <literal>DEBUG5</>,
1625-
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
1626-
<literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
1627-
<literal>WARNING</>, and <literal>ERROR</>. Each level
1628-
includes all the levels that follow it. The later the level,
1629-
the fewer messages are sent. The default is
1630-
<literal>NOTICE</>. Note that <literal>LOG</> has a different
1631-
rank here than in <literal>LOG_MIN_MESSAGES</>.
1638+
Controls the amount of detail written in the server log for each
1639+
message that is logged. Valid values are <literal>TERSE</>,
1640+
<literal>DEFAULT</>, and <literal>VERBOSE</>, each adding more
1641+
fields to displayed messages.
16321642
</para>
16331643
</listitem>
16341644
</varlistentry>
1635-
16361645

16371646
<varlistentry>
16381647
<term><varname>LOG_MIN_ERROR_STATEMENT</varname> (<type>string</type>)</term>
@@ -1643,7 +1652,7 @@ SET ENABLE_SEQSCAN TO OFF;
16431652
statements that cause an error of the specified level, or a
16441653
higher level, are logged. The default is
16451654
<literal>PANIC</literal> (effectively turning this feature
1646-
off). Valid values are <literal>DEBUG5</literal>,
1655+
off for normal use). Valid values are <literal>DEBUG5</literal>,
16471656
<literal>DEBUG4</literal>, <literal>DEBUG3</literal>,
16481657
<literal>DEBUG2</literal>, <literal>DEBUG1</literal>,
16491658
<literal>INFO</literal>, <literal>NOTICE</literal>,
@@ -1654,12 +1663,6 @@ SET ENABLE_SEQSCAN TO OFF;
16541663
logged. Enabling this option can be helpful in tracking down
16551664
the source of any errors that appear in the server log.
16561665
</para>
1657-
1658-
<para>
1659-
It is recommended you enable <varname>LOG_PID</varname> as well
1660-
so you can more easily match the error statement with the error
1661-
message.
1662-
</para>
16631666
</listitem>
16641667
</varlistentry>
16651668

@@ -1668,12 +1671,12 @@ SET ENABLE_SEQSCAN TO OFF;
16681671
<listitem>
16691672
<para>
16701673
Sets a minimum statement execution time (in milliseconds)
1671-
above which a statement will be logged.�All SQL statements
1674+
above which a statement will be logged.All SQL statements
16721675
that run longer than the time specified will be logged together
1673-
withtheduration, in seconds. �The default is <literal>0</literal>
1674-
(turning this feature off). �For example, if you set it
1676+
withtheir actualduration. Setting this to zero (the default)
1677+
disables time-based logging.For example, if you set it
16751678
to <literal>250</literal> then all SQL statements that run longer
1676-
than 250ms will be logged along with the duration. �Enabling this
1679+
than 250ms will be logged.Enabling this
16771680
option can be useful in tracking down unoptimized queries in
16781681
your applications.
16791682
</para>
@@ -1688,8 +1691,8 @@ SET ENABLE_SEQSCAN TO OFF;
16881691
will automatically run in background and any controlling terminals
16891692
are disassociated. Thus, no messages are written to standard
16901693
output or standard error (same effect as <command>postmaster</>'s <option>-S</option>
1691-
option). Unless some logging system such as
1692-
<application>syslog</> is enabled, using this option is
1694+
option). Unless
1695+
<application>syslog</>loggingis enabled, using this option is
16931696
discouraged since it makes it impossible to see error messages.
16941697
</para>
16951698
</listitem>

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

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.111 2003/05/28 18:19:09 tgl Exp $
40+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.112 2003/06/30 16:47:01 tgl Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -68,6 +68,7 @@
6868
ErrorContextCallback*error_context_stack=NULL;
6969

7070
/* GUC parameters */
71+
PGErrorVerbosityLog_error_verbosity=PGERROR_VERBOSE;
7172
boolLog_timestamp;/* show timestamps in stderr output */
7273
boolLog_pid;/* show PIDs in stderr output */
7374

@@ -918,31 +919,61 @@ send_message_to_server_log(ErrorData *edata)
918919

919920
appendStringInfo(&buf,"%s: ",error_severity(edata->elevel));
920921

922+
if (Log_error_verbosity >=PGERROR_VERBOSE)
923+
{
924+
/* unpack MAKE_SQLSTATE code */
925+
chartbuf[12];
926+
intssval;
927+
inti;
928+
929+
ssval=edata->sqlerrcode;
930+
for (i=0;i<5;i++)
931+
{
932+
tbuf[i]=PGUNSIXBIT(ssval);
933+
ssval >>=6;
934+
}
935+
tbuf[i]='\0';
936+
appendStringInfo(&buf,"%s: ",tbuf);
937+
}
938+
921939
if (edata->message)
922-
appendStringInfo(&buf,"%s\n",edata->message);
940+
appendStringInfoString(&buf,edata->message);
923941
else
924-
appendStringInfoString(&buf,"missing error text\n");
942+
appendStringInfoString(&buf,gettext("missing error text"));
925943

926-
/* XXX showing of additional info should perhaps be optional */
927-
/* XXX ought to localize the label strings, probably */
944+
if (edata->cursorpos>0)
945+
appendStringInfo(&buf,gettext(" at character %d"),edata->cursorpos);
928946

929-
if (edata->detail)
930-
appendStringInfo(&buf,"DETAIL: %s\n",edata->detail);
931-
if (edata->hint)
932-
appendStringInfo(&buf,"HINT: %s\n",edata->hint);
933-
if (edata->context)
934-
appendStringInfo(&buf,"CONTEXT: %s\n",edata->context);
935-
if (edata->funcname&&edata->filename)
936-
appendStringInfo(&buf,"IN: %s (%s:%d)\n",
937-
edata->funcname,edata->filename,edata->lineno);
947+
appendStringInfoChar(&buf,'\n');
948+
949+
if (Log_error_verbosity >=PGERROR_DEFAULT)
950+
{
951+
if (edata->detail)
952+
appendStringInfo(&buf,gettext("DETAIL: %s\n"),edata->detail);
953+
if (edata->hint)
954+
appendStringInfo(&buf,gettext("HINT: %s\n"),edata->hint);
955+
if (edata->context)
956+
appendStringInfo(&buf,gettext("CONTEXT: %s\n"),edata->context);
957+
if (Log_error_verbosity >=PGERROR_VERBOSE)
958+
{
959+
if (edata->funcname&&edata->filename)
960+
appendStringInfo(&buf,gettext("LOCATION: %s, %s:%d\n"),
961+
edata->funcname,edata->filename,
962+
edata->lineno);
963+
elseif (edata->filename)
964+
appendStringInfo(&buf,gettext("LOCATION: %s:%d\n"),
965+
edata->filename,edata->lineno);
966+
}
967+
}
938968

939969
/*
940970
* If the user wants the query that generated this error logged, do so.
941971
* We use debug_query_string to get at the query, which is kinda useless
942972
* for queries triggered by extended query protocol; how to improve?
943973
*/
944974
if (edata->elevel >=log_min_error_statement&&debug_query_string!=NULL)
945-
appendStringInfo(&buf,"STATEMENT: %s\n",debug_query_string);
975+
appendStringInfo(&buf,gettext("STATEMENT: %s\n"),
976+
debug_query_string);
946977

947978

948979
#ifdefHAVE_SYSLOG
@@ -992,11 +1023,10 @@ send_message_to_server_log(ErrorData *edata)
9921023
* Timestamp and PID are only used for stderr output --- we assume
9931024
* the syslog daemon will supply them for us in the other case.
9941025
*/
995-
if (Log_timestamp)
996-
fprintf(stderr,"%s",print_timestamp());
997-
if (Log_pid)
998-
fprintf(stderr,"%s",print_pid());
999-
fprintf(stderr,"%s",buf.data);
1026+
fprintf(stderr,"%s%s%s",
1027+
Log_timestamp ?print_timestamp() :"",
1028+
Log_pid ?print_pid() :"",
1029+
buf.data);
10001030
}
10011031

10021032
pfree(buf.data);

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

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.132 2003/06/27 19:08:38 tgl Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.133 2003/06/30 16:47:01 tgl Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -94,6 +94,8 @@ static const char *assign_min_error_statement(const char *newval, bool doit,
9494
boolinteractive);
9595
staticconstchar*assign_msglvl(int*var,constchar*newval,
9696
booldoit,boolinteractive);
97+
staticconstchar*assign_log_error_verbosity(constchar*newval,booldoit,
98+
boolinteractive);
9799
staticboolassign_phony_autocommit(boolnewval,booldoit,boolinteractive);
98100

99101

@@ -134,9 +136,10 @@ intclient_min_messages = NOTICE;
134136
* cases provide the value for SHOW to display. The real state is elsewhere
135137
* and is kept in sync by assign_hooks.
136138
*/
137-
staticchar*log_min_error_statement_str;
138-
staticchar*log_min_messages_str;
139139
staticchar*client_min_messages_str;
140+
staticchar*log_min_messages_str;
141+
staticchar*log_error_verbosity_str;
142+
staticchar*log_min_error_statement_str;
140143
staticboolphony_autocommit;
141144
staticboolsession_auth_is_superuser;
142145
staticdoublephony_random_seed;
@@ -820,6 +823,16 @@ static struct config_string
820823
"notice",assign_client_min_messages,NULL
821824
},
822825

826+
{
827+
{"log_min_messages",PGC_SUSET},&log_min_messages_str,
828+
"notice",assign_log_min_messages,NULL
829+
},
830+
831+
{
832+
{"log_error_verbosity",PGC_SUSET},&log_error_verbosity_str,
833+
"default",assign_log_error_verbosity,NULL
834+
},
835+
823836
{
824837
{"log_min_error_statement",PGC_SUSET},&log_min_error_statement_str,
825838
"panic",assign_min_error_statement,NULL
@@ -909,11 +922,6 @@ static struct config_string
909922
PG_VERSION,NULL,NULL
910923
},
911924

912-
{
913-
{"log_min_messages",PGC_SUSET},&log_min_messages_str,
914-
"notice",assign_log_min_messages,NULL
915-
},
916-
917925
/* Not for general use --- used by SET SESSION AUTHORIZATION */
918926
{
919927
{"session_authorization",PGC_USERSET,GUC_NO_SHOW_ALL |GUC_NO_RESET_ALL},
@@ -3468,6 +3476,29 @@ assign_msglvl(int *var, const char *newval, bool doit, bool interactive)
34683476
returnnewval;/* OK */
34693477
}
34703478

3479+
staticconstchar*
3480+
assign_log_error_verbosity(constchar*newval,booldoit,boolinteractive)
3481+
{
3482+
if (strcasecmp(newval,"terse")==0)
3483+
{
3484+
if (doit)
3485+
Log_error_verbosity=PGERROR_TERSE;
3486+
}
3487+
elseif (strcasecmp(newval,"default")==0)
3488+
{
3489+
if (doit)
3490+
Log_error_verbosity=PGERROR_DEFAULT;
3491+
}
3492+
elseif (strcasecmp(newval,"verbose")==0)
3493+
{
3494+
if (doit)
3495+
Log_error_verbosity=PGERROR_VERBOSE;
3496+
}
3497+
else
3498+
returnNULL;/* fail */
3499+
returnnewval;/* OK */
3500+
}
3501+
34713502
staticbool
34723503
assign_phony_autocommit(boolnewval,booldoit,boolinteractive)
34733504
{

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,16 @@
119119
#
120120
#Message display
121121
#
122+
#client_min_messages = notice# Values, in order of decreasing detail:
123+
# debug5, debug4, debug3, debug2, debug1,
124+
# log, info, notice, warning, error
122125
#log_min_messages = notice# Values, in order of decreasing detail:
123126
# debug5, debug4, debug3, debug2, debug1,
124127
# info, notice, warning, error, log, fatal,
125128
# panic
126-
#client_min_messages = notice# Values, in order of decreasing detail:
127-
# debug5, debug4, debug3, debug2, debug1,
128-
# log, info, notice, warning, error
129+
130+
#log_error_verbosity = default# terse, default, or verbose messages
131+
129132
#silent_mode = false
130133

131134
#log_connections = false

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

Lines changed: 2 additions & 1 deletion
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.80 2003/06/12 01:38:08 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.81 2003/06/30 16:47:01 tgl Exp $
77
*/
88

99
/*----------------------------------------------------------------------
@@ -543,6 +543,7 @@ psql_completion(char *text, int start, int end)
543543
"lc_numeric",
544544
"lc_time",
545545
"log_duration",
546+
"log_error_verbosity",
546547
"log_executor_stats",
547548
"log_min_duration_statement",
548549
"log_min_error_statement",

‎src/include/utils/elog.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: elog.h,v 1.44 2003/05/27 17:49:46 momjian Exp $
10+
* $Id: elog.h,v 1.45 2003/06/30 16:47:02 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -268,6 +268,15 @@ extern DLLIMPORT ErrorContextCallback *error_context_stack;
268268

269269

270270
/* GUC-configurable parameters */
271+
272+
typedefenum
273+
{
274+
PGERROR_TERSE,/* single-line error messages */
275+
PGERROR_DEFAULT,/* recommended style */
276+
PGERROR_VERBOSE/* all the facts, ma'am */
277+
}PGErrorVerbosity;
278+
279+
externPGErrorVerbosityLog_error_verbosity;
271280
externboolLog_timestamp;
272281
externboolLog_pid;
273282
#ifdefHAVE_SYSLOG

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp