Commit c74c7e60 authored by Bruce Momjian's avatar Bruce Momjian

Turn GUC log_min_error_statement off by default by setting it to PANIC.

parent fd972e7f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.141 2002/09/27 02:04:39 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.142 2002/10/02 16:27:57 momjian Exp $
--> -->
<Chapter Id="runtime"> <Chapter Id="runtime">
...@@ -1036,15 +1036,15 @@ env PGOPTIONS='-c geqo=off' psql ...@@ -1036,15 +1036,15 @@ env PGOPTIONS='-c geqo=off' psql
<term><varname>LOG_MIN_ERROR_STATEMENT</varname> (<type>string</type>)</term> <term><varname>LOG_MIN_ERROR_STATEMENT</varname> (<type>string</type>)</term>
<listitem> <listitem>
<para> <para>
This controls which log messages are accompanied by the original This controls which message types output the original query to
query which generated the message. All queries matching the setting the server logs. All queries matching the setting or higher are
or which are of a higher severity than the setting are logged. The logged. The default is <literal>PANIC</literal>. Valid values
default is <literal>ERROR</literal>. Valid values are are <literal>DEBUG5</literal>, <literal>DEBUG4</literal>,
<literal>DEBUG5</literal>, <literal>DEBUG4</literal>,
<literal>DEBUG3</literal>, <literal>DEBUG2</literal>, <literal>DEBUG3</literal>, <literal>DEBUG2</literal>,
<literal>DEBUG1</literal>, <literal>INFO</literal>, <literal>DEBUG1</literal>, <literal>INFO</literal>,
<literal>NOTICE</literal>, <literal>WARNING</literal> <literal>NOTICE</literal>, <literal>WARNING</literal>,
and <literal>ERROR</literal>. <literal>ERROR</literal>, <literal>FATAL</literal>, and
<literal>PANIC</literal>.
</para> </para>
<para> <para>
It is recommended you enable <literal>LOG_PID</literal> as well It is recommended you enable <literal>LOG_PID</literal> as well
......
...@@ -5,7 +5,7 @@ ...@@ -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.96 2002/09/22 19:52:38 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.97 2002/10/02 16:27:57 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>.
...@@ -104,7 +104,7 @@ bool Password_encryption = true; ...@@ -104,7 +104,7 @@ bool Password_encryption = true;
int log_min_error_statement = ERROR; 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[] = "error"; const char log_min_error_statement_str_default[] = "panic";
int server_min_messages = NOTICE; int server_min_messages = NOTICE;
char *server_min_messages_str = NULL; char *server_min_messages_str = NULL;
...@@ -3000,6 +3000,17 @@ assign_msglvl(int *var, const char *newval, bool doit, bool interactive) ...@@ -3000,6 +3000,17 @@ assign_msglvl(int *var, const char *newval, bool doit, bool interactive)
if (doit) if (doit)
(*var) = ERROR; (*var) = ERROR;
} }
/* We allow FATAL/PANIC for client-side messages too. */
else if (strcasecmp(newval, "fatal") == 0)
{
if (doit)
(*var) = FATAL;
}
else if (strcasecmp(newval, "panic") == 0)
{
if (doit)
(*var) = PANIC;
}
else else
return NULL; /* fail */ return NULL; /* fail */
return newval; /* OK */ return newval; /* OK */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment