Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a033daf

Browse files
bmomjianbmomjian
committed
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
1 parent 8d8aa93 commit a033daf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1053
-901
lines changed

‎doc/src/sgml/ref/postgres-ref.sgml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.23 2001/12/08 03:24:38 thomas Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.24 2002/03/02 21:39:16 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -141,8 +141,10 @@ PostgreSQL documentation
141141
<para>
142142
The options <option>-A</option>, <option>-B</option>,
143143
<option>-c</option>, <option>-d</option>, <option>-D</option>,
144-
<option>-F</option>, and <option>--name</> have the same meanings as
145-
for the <xref linkend="app-postmaster">.
144+
<option>-F</option>, and <option>--name</> have the same meanings
145+
as the <xref linkend="app-postmaster"> except that
146+
<option>-d</option> <literal>0</> prevents the debugging level of
147+
the postmaster from being propogated to the backend.
146148
</para>
147149

148150
<variablelist>

‎doc/src/sgml/ref/postmaster.sgml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.26 2001/12/08 03:24:38 thomas Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.27 2002/03/02 21:39:16 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -127,9 +127,8 @@ PostgreSQL documentation
127127
<listitem>
128128
<para>
129129
Sets the debug level. The higher this value is set, the more
130-
debugging output is written to the server log. The default is
131-
0, which means no debugging. Values up to 4 are useful; higher
132-
numbers produce no additional output.
130+
debugging output is written to the server log. Values are from
131+
1 to 5.
133132
</para>
134133
</listitem>
135134
</varlistentry>

‎doc/src/sgml/runtime.sgml

Lines changed: 33 additions & 14 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.104 2002/03/01 22:45:05 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.105 2002/03/02 21:39:15 momjian Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -813,6 +813,38 @@ env PGOPTIONS='-c geqo=off' psql
813813

814814
<para>
815815
<variablelist>
816+
<varlistentry>
817+
<term><varname>SERVER_MIN_MESSAGES</varname> (<type>string</type>)</term>
818+
<listitem>
819+
<para>
820+
This controls how much detail is written to the server logs. The
821+
default is <literal>NOTICE</>. Valid values are <literal>DEBUG5</>,
822+
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
823+
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
824+
<literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>,
825+
<literal>PANIC</>. Later values send less detail to the logs.
826+
<literal>LOG</> has a different precedence here than in
827+
<literal>CLIENT_MIN_MESSAGES</>.
828+
</para>
829+
</listitem>
830+
</varlistentry>
831+
832+
<varlistentry>
833+
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
834+
<listitem>
835+
<para>
836+
This controls how much detail is written to the client. The
837+
default is <literal>INFO</>. Valid values are
838+
<literal>DEBUG5</>, <literal>DEBUG4</>, <literal>DEBUG3</>,
839+
<literal>DEBUG2</>, <literal>DEBUG1</>, <literal>LOG</>,
840+
<literal>INFO</>, <literal>NOTICE</>, <literal>ERROR</>,
841+
<literal>FATAL</>, <literal>PANIC</>. Later values send less
842+
information to the user. literal>LOG</> has a different
843+
precedence here than in <literal>SERVER_MIN_MESSAGES</>.
844+
</para>
845+
</listitem>
846+
</varlistentry>
847+
816848
<varlistentry>
817849
<term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term>
818850
<listitem>
@@ -829,19 +861,6 @@ env PGOPTIONS='-c geqo=off' psql
829861
</listitem>
830862
</varlistentry>
831863

832-
<varlistentry>
833-
<term><varname>DEBUG_LEVEL</varname> (<type>integer</type>)</term>
834-
<listitem>
835-
<para>
836-
The higher this value is set, the more
837-
<quote>debugging</quote> output of various sorts is generated
838-
in the server log during operation. This option is 0 by
839-
default, which means no debugging output. Values up to about 4
840-
currently make sense.
841-
</para>
842-
</listitem>
843-
</varlistentry>
844-
845864
<varlistentry>
846865
<term><varname>DEBUG_PRINT_QUERY</varname> (<type>boolean</type>)</term>
847866
<term><varname>DEBUG_PRINT_PARSE</varname> (<type>boolean</type>)</term>

‎src/backend/access/gist/gist.c

Lines changed: 3 additions & 3 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/access/gist/gist.c,v 1.88 2002/02/11 22:41:59 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.89 2002/03/02 21:39:16 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1953,13 +1953,13 @@ gist_dumptree(Relation r, int level, BlockNumber blk, OffsetNumber coff)
19531953
void
19541954
gist_redo(XLogRecPtr lsn, XLogRecord *record)
19551955
{
1956-
elog(STOP, "gist_redo: unimplemented");
1956+
elog(PANIC, "gist_redo: unimplemented");
19571957
}
19581958

19591959
void
19601960
gist_undo(XLogRecPtr lsn, XLogRecord *record)
19611961
{
1962-
elog(STOP, "gist_undo: unimplemented");
1962+
elog(PANIC, "gist_undo: unimplemented");
19631963
}
19641964

19651965
void

‎src/backend/access/hash/hash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.53 2001/10/25 05:49:20 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.54 2002/03/02 21:39:16 momjian Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
@@ -468,13 +468,13 @@ hashbulkdelete(PG_FUNCTION_ARGS)
468468
void
469469
hash_redo(XLogRecPtr lsn, XLogRecord *record)
470470
{
471-
elog(STOP, "hash_redo: unimplemented");
471+
elog(PANIC, "hash_redo: unimplemented");
472472
}
473473

474474
void
475475
hash_undo(XLogRecPtr lsn, XLogRecord *record)
476476
{
477-
elog(STOP, "hash_undo: unimplemented");
477+
elog(PANIC, "hash_undo: unimplemented");
478478
}
479479

480480
void

0 commit comments

Comments
 (0)