Change made to elog:

o  Change all current CVS messages of NOTICE to WARNING.  We were going
to do this just before 7.3 beta but it has to be done now, as you will
see below.

o Change current INFO messages that should be controlled by
client_min_messages to NOTICE.

o Force remaining INFO messages, like from EXPLAIN, VACUUM VERBOSE, etc.
to always go to the client.

o Remove INFO from the client_min_messages options and add NOTICE.

Seems we do need three non-ERROR elog levels to handle the various
behaviors we need for these messages.

Regression passed.

2 files changed, 20 insertions, 20 deletions

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index b8ccbe9f52f..c0858076f6b 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -29,7 +29,7 @@
  * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	$Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.14 2002/03/02 21:39:35 momjian Exp $
+ *	$Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.15 2002/03/06 06:10:47 momjian Exp $
  *
  *********************************************************************
  */
@@ -415,7 +415,7 @@ plpython_call_handler(PG_FUNCTION_ARGS)
 	}
 
 	/*
-	 * elog(NOTICE, "PLy_restart_in_progress is %d",
+	 * elog(DEBUG3, "PLy_restart_in_progress is %d",
 	 * PLy_restart_in_progress);
 	 */
 
@@ -506,7 +506,7 @@ PLy_trigger_handler(FunctionCallInfo fcinfo, PLyProcedure * proc)
 				(TRIGGER_FIRED_BY_UPDATE(tdata->tg_event)))
 				rv = PLy_modify_tuple(proc, plargs, tdata, rv);
 			else
-				elog(NOTICE, "plpython: Ignoring modified tuple in DELETE trigger");
+				elog(WARNING, "plpython: Ignoring modified tuple in DELETE trigger");
 		}
 		else if (strcasecmp(srv, "OK"))
 		{
@@ -2037,7 +2037,7 @@ PLy_spi_prepare(PyObject * self, PyObject * args)
 		if (!PyErr_Occurred())
 			PyErr_SetString(PLy_exc_spi_error,
 							"Unknown error in PLy_spi_prepare.");
-		PLy_elog(NOTICE,"in function %s:",PLy_procedure_name(PLy_last_procedure));
+		PLy_elog(WARNING,"in function %s:",PLy_procedure_name(PLy_last_procedure));
 		RERAISE_EXC();
 	}
 
@@ -2234,7 +2234,7 @@ PLy_spi_execute_plan(PyObject * ob, PyObject * list, int limit)
 		if (!PyErr_Occurred())
 			PyErr_SetString(PLy_exc_error,
 							"Unknown error in PLy_spi_execute_plan");
-		PLy_elog(NOTICE,"in function %s:",PLy_procedure_name(PLy_last_procedure));
+		PLy_elog(WARNING,"in function %s:",PLy_procedure_name(PLy_last_procedure));
 		RERAISE_EXC();
 	}
 
@@ -2300,7 +2300,7 @@ PLy_spi_execute_query(char *query, int limit)
 		if ((!PLy_restart_in_progress) && (!PyErr_Occurred()))
 			PyErr_SetString(PLy_exc_spi_error,
 							"Unknown error in PLy_spi_execute_query.");
-		PLy_elog(NOTICE,"in function %s:",PLy_procedure_name(PLy_last_procedure));
+		PLy_elog(WARNING,"in function %s:",PLy_procedure_name(PLy_last_procedure));
 		RERAISE_EXC();
 	}
 
@@ -2664,7 +2664,7 @@ PLy_log(volatile int level, PyObject * self, PyObject * args)
 	enter();
 
 	if (args == NULL)
-		elog(NOTICE, "plpython, args is NULL in %s", __FUNCTION__);
+		elog(WARNING, "plpython, args is NULL in %s", __FUNCTION__);
 
 	so = PyObject_Str(args);
 	if ((so == NULL) || ((sv = PyString_AsString(so)) == NULL))
@@ -2690,7 +2690,7 @@ PLy_log(volatile int level, PyObject * self, PyObject * args)
 	}
 
 	/*
-	 * ok, this is a NOTICE, or LOG message
+	 * ok, this is a WARNING, or LOG message
 	 *
 	 * but just in case DON'T long jump out of the interpreter!
 	 */
@@ -2828,7 +2828,7 @@ PLy_traceback(int *xlevel)
 	 */
 	if (e == NULL)
 	{
-		*xlevel = NOTICE;
+		*xlevel = WARNING;
 		return NULL;
 	}
 
diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h
index e62d036c83f..c2f6bba6f45 100644
--- a/src/pl/plpython/plpython.h
+++ b/src/pl/plpython/plpython.h
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.5 2001/11/05 17:46:39 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.6 2002/03/06 06:10:48 momjian Exp $ */
 
 #ifndef PLPYTHON_H
 #define PLPYTHON_H
@@ -16,21 +16,21 @@
 #define RAISE_EXC(V) siglongjmp(Warn_restart, (V))
 #else
 #define RESTORE_N_EXC(N) do { \
-   elog(NOTICE, "exception (%d,%d) restore at %s:%d",\
+   elog(WARNING, "exception (%d,%d) restore at %s:%d",\
 		PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__));\
    exc_save_calls -= 1; \
    memcpy(&Warn_restart, &(buf_##N), sizeof(sigjmp_buf)); } while (0)
 #define SAVE_N_EXC(N) do { \
    exc_save_calls += 1; \
-   elog(NOTICE, "exception (%d,%d) save at %s:%d", \
+   elog(WARNING, "exception (%d,%d) save at %s:%d", \
 		PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__)); \
    memcpy(&(buf_##N), &Warn_restart, sizeof(sigjmp_buf)); } while (0)
 #define RERAISE_N_EXC(N) do { \
-   elog(NOTICE, "exception (%d,%d) reraise at %s:%d", \
+   elog(WARNING, "exception (%d,%d) reraise at %s:%d", \
    PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__)); \
    siglongjmp(Warn_restart, rv_##N); } while (0)
 #define RAISE_EXC(V) do { \
-   elog(NOTICE, "exception (%d,%d) raise at %s:%d", \
+   elog(WARNING, "exception (%d,%d) raise at %s:%d", \
    PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__)); \
    siglongjmp(Warn_restart, (V)); } while (0)
 #endif
@@ -43,8 +43,8 @@
 
 #if DEBUG_LEVEL
 #define CALL_LEVEL_INC() do { PLy_call_level += 1; \
-	elog(NOTICE, "Level: %d", PLy_call_level); } while (0)
-#define CALL_LEVEL_DEC() do { elog(NOTICE, "Level: %d", PLy_call_level); \
+	elog(DEBUG3, "Level: %d", PLy_call_level); } while (0)
+#define CALL_LEVEL_DEC() do { elog(DEBUG3, "Level: %d", PLy_call_level); \
 	PLy_call_level -= 1; } while (0)
 #else
 #define CALL_LEVEL_INC() do { PLy_call_level += 1; } while (0)
@@ -54,10 +54,10 @@
 /* temporary debugging macros
  */
 #if DEBUG_LEVEL
-#define enter() elog(NOTICE, "Enter(%d): %s", func_enter_calls++,__FUNCTION__)
-#define leave() elog(NOTICE, "Leave(%d): %s", func_leave_calls++,__FUNCTION__)
-#define mark() elog(NOTICE, "Mark: %s:%d", __FUNCTION__, __LINE__);
-#define refc(O) elog(NOTICE, "Ref<%p>:<%d>:%s:%d", (O), (((O) == NULL) ? -1 : (O)->ob_refcnt), __FUNCTION__, __LINE__)
+#define enter() elog(DEBUG3, "Enter(%d): %s", func_enter_calls++,__FUNCTION__)
+#define leave() elog(DEBUG3, "Leave(%d): %s", func_leave_calls++,__FUNCTION__)
+#define mark() elog(DEBUG3, "Mark: %s:%d", __FUNCTION__, __LINE__);
+#define refc(O) elog(DEBUG3, "Ref<%p>:<%d>:%s:%d", (O), (((O) == NULL) ? -1 : (O)->ob_refcnt), __FUNCTION__, __LINE__)
 #else
 #define enter()
 #define leave()