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/commands/explain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backend/commands/explain.c') diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 9c966873147..faea169a636 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.68 2002/02/26 22:47:04 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.69 2002/03/02 21:39:23 momjian Exp $ * */ @@ -59,7 +59,7 @@ ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest) /* rewriter will not cope with utility statements */ if (query->commandType == CMD_UTILITY) { - elog(NOTICE, "Utility statements have no plan structure"); + elog(INFO, "Utility statements have no plan structure"); return; } @@ -69,7 +69,7 @@ ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest) /* In the case of an INSTEAD NOTHING, tell at least that */ if (rewritten == NIL) { - elog(NOTICE, "Query rewrites to nothing"); + elog(INFO, "Query rewrites to nothing"); return; } @@ -94,9 +94,9 @@ ExplainOneQuery(Query *query, bool verbose, bool analyze, CommandDest dest) if (query->commandType == CMD_UTILITY) { if (query->utilityStmt && IsA(query->utilityStmt, NotifyStmt)) - elog(NOTICE, "QUERY PLAN:\n\nNOTIFY\n"); + elog(INFO, "QUERY PLAN:\n\nNOTIFY\n"); else - elog(NOTICE, "QUERY PLAN:\n\nUTILITY\n"); + elog(INFO, "QUERY PLAN:\n\nUTILITY\n"); return; } @@ -152,7 +152,7 @@ ExplainOneQuery(Query *query, bool verbose, bool analyze, CommandDest dest) s = nodeToString(plan); if (s) { - elog(NOTICE, "QUERY DUMP:\n\n%s", s); + elog(INFO, "QUERY DUMP:\n\n%s", s); pfree(s); } } @@ -165,7 +165,7 @@ ExplainOneQuery(Query *query, bool verbose, bool analyze, CommandDest dest) if (analyze) appendStringInfo(str, "Total runtime: %.2f msec\n", 1000.0 * totaltime); - elog(NOTICE, "QUERY PLAN:\n\n%s", str->data); + elog(INFO, "QUERY PLAN:\n\n%s", str->data); pfree(str->data); pfree(str); } -- cgit v1.2.3