Commit to match discussed elog() changes. Only update is that LOG is

now just below FATAL in server_min_messages.  Added more text to
highlight ordering difference between it and client_min_messages.

---------------------------------------------------------------------------

REALLYFATAL => PANIC
STOP => PANIC
New INFO level the prints to client by default
New LOG level the prints to server log by default
Cause VACUUM information to print only to the client
NOTICE => INFO where purely information messages are sent
DEBUG => LOG for purely server status messages
DEBUG removed, kept as backward compatible
DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1 added
DebugLvl removed in favor of new DEBUG[1-5] symbols
New server_min_messages GUC parameter with values:
        DEBUG[5-1], INFO, NOTICE, ERROR, LOG, FATAL, PANIC
New client_min_messages GUC parameter with values:
        DEBUG[5-1], LOG, INFO, NOTICE, ERROR, FATAL, PANIC
Server startup now logged with LOG instead of DEBUG
Remove debug_level GUC parameter
elog() numbers now start at 10
Add test to print error message if older elog() values are passed to elog()
Bootstrap mode now has a -d that requires an argument, like postmaster

3 files changed, 41 insertions, 21 deletions

diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 33e9b462373..93cf8de8bd1 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.23 2001/12/08 03:24:38 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.24 2002/03/02 21:39:16 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -141,8 +141,10 @@ PostgreSQL documentation
     <para>
      The options <option>-A</option>, <option>-B</option>,
      <option>-c</option>, <option>-d</option>, <option>-D</option>,
-     <option>-F</option>, and <option>--name</> have the same meanings as
-     for the <xref linkend="app-postmaster">.
+     <option>-F</option>, and <option>--name</> have the same meanings
+     as the <xref linkend="app-postmaster"> except that
+     <option>-d</option> <literal>0</> prevents the debugging level of
+     the postmaster from being propogated to the backend.
     </para>
 
     <variablelist>
diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index a693164825c..011144c1d5a 100644
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.26 2001/12/08 03:24:38 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.27 2002/03/02 21:39:16 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -127,9 +127,8 @@ PostgreSQL documentation
       <listitem>
        <para>
         Sets the debug level.  The higher this value is set, the more
-        debugging output is written to the server log.  The default is
-        0, which means no debugging.  Values up to 4 are useful; higher
-	numbers produce no additional output.
+        debugging output is written to the server log.  Values are from
+	1 to 5.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 3f46a3e9e4f..2ce788b1ea7 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.104 2002/03/01 22:45:05 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.105 2002/03/02 21:39:15 momjian Exp $
 -->
 
 <Chapter Id="runtime">
@@ -814,6 +814,38 @@ env PGOPTIONS='-c geqo=off' psql
    <para>
     <variablelist>
      <varlistentry>
+      <term><varname>SERVER_MIN_MESSAGES</varname> (<type>string</type>)</term>
+      <listitem>
+       <para>
+        This controls how much detail is written to the server logs. The
+        default is <literal>NOTICE</>. Valid values are <literal>DEBUG5</>,
+        <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
+        <literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
+        <literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>,
+        <literal>PANIC</>. Later values send less detail to the logs.
+        <literal>LOG</> has a different precedence here than in
+        <literal>CLIENT_MIN_MESSAGES</>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
+      <listitem>
+       <para>
+        This controls how much detail is written to the client. The
+        default is <literal>INFO</>. Valid values are
+        <literal>DEBUG5</>, <literal>DEBUG4</>, <literal>DEBUG3</>,
+        <literal>DEBUG2</>, <literal>DEBUG1</>, <literal>LOG</>,
+        <literal>INFO</>, <literal>NOTICE</>, <literal>ERROR</>,
+        <literal>FATAL</>, <literal>PANIC</>. Later values send less
+        information to the user. literal>LOG</> has a different
+        precedence here than in <literal>SERVER_MIN_MESSAGES</>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
       <term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term>
       <listitem>
        <para>
@@ -830,19 +862,6 @@ env PGOPTIONS='-c geqo=off' psql
      </varlistentry>
 
      <varlistentry>
-      <term><varname>DEBUG_LEVEL</varname> (<type>integer</type>)</term>
-      <listitem>
-       <para>
-        The higher this value is set, the more
-        <quote>debugging</quote> output of various sorts is generated
-        in the server log during operation. This option is 0 by
-        default, which means no debugging output. Values up to about 4
-        currently make sense.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
       <term><varname>DEBUG_PRINT_QUERY</varname> (<type>boolean</type>)</term>
       <term><varname>DEBUG_PRINT_PARSE</varname> (<type>boolean</type>)</term>
       <term><varname>DEBUG_PRINT_REWRITTEN</varname> (<type>boolean</type>)</term>