From a033daf5663944872080f1f52deb2ffcb40f4042 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 2 Mar 2002 21:39:36 +0000 Subject: 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 --- src/backend/libpq/pqcomm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backend/libpq/pqcomm.c') diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 432e88ddf1..8fee496e35 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -29,7 +29,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.c,v 1.126 2001/12/04 20:57:22 tgl Exp $ + * $Id: pqcomm.c,v 1.127 2002/03/02 21:39:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -507,15 +507,15 @@ pq_recvbuf(void) * Careful: an elog() that tries to write to the client * would cause recursion to here, leading to stack overflow * and core dump! This message must go *only* to the postmaster - * log. elog(DEBUG) is presently safe. + * log. elog(LOG) is presently safe. */ - elog(DEBUG, "pq_recvbuf: recv() failed: %m"); + elog(LOG, "pq_recvbuf: recv() failed: %m"); return EOF; } if (r == 0) { /* as above, only write to postmaster log */ - elog(DEBUG, "pq_recvbuf: unexpected EOF on client connection"); + elog(LOG, "pq_recvbuf: unexpected EOF on client connection"); return EOF; } /* r contains number of bytes read, so just incr length */ @@ -680,7 +680,7 @@ pq_flush(void) * Careful: an elog() that tries to write to the client * would cause recursion to here, leading to stack overflow * and core dump! This message must go *only* to the postmaster - * log. elog(DEBUG) is presently safe. + * log. elog(LOG) is presently safe. * * If a client disconnects while we're in the midst of output, * we might write quite a bit of data before we get to a safe @@ -689,7 +689,7 @@ pq_flush(void) if (errno != last_reported_send_errno) { last_reported_send_errno = errno; - elog(DEBUG, "pq_flush: send() failed: %m"); + elog(LOG, "pq_flush: send() failed: %m"); } /* @@ -723,7 +723,7 @@ pq_eof(void) if (res < 0) { /* can log to postmaster log only */ - elog(DEBUG, "pq_eof: recv() failed: %m"); + elog(LOG, "pq_eof: recv() failed: %m"); return EOF; } if (res == 0) -- cgit v1.2.1