Rename server_min_messages to log_min_messages. Part of consolidation

of log_ settings.

8 files changed, 30 insertions, 30 deletions

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index a2b26bcdb00..b1eb7eb21a8 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.144 2002/09/26 22:58:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.145 2002/11/14 23:53:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -263,7 +263,7 @@ BootstrapMain(int argc, char *argv[])
 					char	   *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
 
 					sprintf(debugstr, "debug%s", optarg);
-					SetConfigOption("server_min_messages", debugstr,
+					SetConfigOption("log_min_messages", debugstr,
 									PGC_POSTMASTER, PGC_S_ARGV);
 					SetConfigOption("client_min_messages", debugstr,
 									PGC_POSTMASTER, PGC_S_ARGV);
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 7f368020076..69363cd8f76 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.293 2002/11/13 00:39:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.294 2002/11/14 23:53:27 momjian Exp $
  *
  * NOTES
  *
@@ -451,7 +451,7 @@ PostmasterMain(int argc, char *argv[])
 					char	   *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
 
 					sprintf(debugstr, "debug%s", optarg);
-					SetConfigOption("server_min_messages", debugstr,
+					SetConfigOption("log_min_messages", debugstr,
 									PGC_POSTMASTER, PGC_S_ARGV);
 					pfree(debugstr);
 					debug_flag = atoi(optarg);
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 82eebee4fa8..0a69c3bb7da 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.307 2002/10/31 21:34:16 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.308 2002/11/14 23:53:27 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1339,7 +1339,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 						char	   *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
 
 						sprintf(debugstr, "debug%s", optarg);
-						SetConfigOption("server_min_messages", debugstr, ctx, gucsource);
+						SetConfigOption("log_min_messages", debugstr, ctx, gucsource);
 						pfree(debugstr);
 
 					}
@@ -1349,7 +1349,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 						 * from propagating to backend.  It would be nice
 						 * to set it to the postgresql.conf value here.
 						 */
-						SetConfigOption("server_min_messages", "notice",
+						SetConfigOption("log_min_messages", "notice",
 										ctx, gucsource);
 				}
 				break;
@@ -1590,7 +1590,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 
 	/*
 	 * -d is not the same as setting
-	 * server_min_messages because it enables other
+	 * log_min_messages because it enables other
 	 * output options.
 	 */
 	if (debug_flag >= 1)
@@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.307 $ $Date: 2002/10/31 21:34:16 $\n");
+		puts("$Revision: 1.308 $ $Date: 2002/11/14 23:53:27 $\n");
 	}
 
 	/*
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 66c17e2e8cc..94abd521b61 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.104 2002/11/01 17:55:23 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.105 2002/11/14 23:53:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -148,21 +148,21 @@ elog(int lev, const char *fmt,...)
 	/* Complicated because LOG is sorted out-of-order for this purpose */
 	if (lev == LOG || lev == COMMERROR)
 	{
-		if (server_min_messages == LOG)
+		if (log_min_messages == LOG)
 			output_to_server = true;
-		else if (server_min_messages < FATAL)
+		else if (log_min_messages < FATAL)
 			output_to_server = true;
 	}
 	else
 	{
 		/* lev != LOG */
-		if (server_min_messages == LOG)
+		if (log_min_messages == LOG)
 		{
 			if (lev >= FATAL)
 				output_to_server = true;
 		}
 		/* Neither is LOG */
-		else if (lev >= server_min_messages)
+		else if (lev >= log_min_messages)
 			output_to_server = true;
 	}
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ac1c97fedff..8802e5fbdce 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5,7 +5,7 @@
  * command, configuration file, and command line options.
  * See src/backend/utils/misc/README for more information.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.100 2002/11/08 17:37:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.101 2002/11/14 23:53:27 momjian Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -105,9 +105,9 @@ int			log_min_error_statement = ERROR;
 char	   *log_min_error_statement_str = NULL;
 const char	log_min_error_statement_str_default[] = "panic";
 
-int			server_min_messages = NOTICE;
-char	   *server_min_messages_str = NULL;
-const char	server_min_messages_str_default[] = "notice";
+int			log_min_messages = NOTICE;
+char	   *log_min_messages_str = NULL;
+const char	log_min_messages_str_default[] = "notice";
 
 int			client_min_messages = NOTICE;
 char	   *client_min_messages_str = NULL;
@@ -805,8 +805,8 @@ static struct config_string
 	},
 
 	{
-		{"server_min_messages", PGC_USERSET}, &server_min_messages_str,
-		server_min_messages_str_default, assign_server_min_messages, NULL
+		{"log_min_messages", PGC_USERSET}, &log_min_messages_str,
+		log_min_messages_str_default, assign_log_min_messages, NULL
 	},
 
 	{
@@ -2927,10 +2927,10 @@ GUCArrayDelete(ArrayType *array, const char *name)
 }
 
 const char *
-assign_server_min_messages(const char *newval,
+assign_log_min_messages(const char *newval,
 						   bool doit, bool interactive)
 {
-	return (assign_msglvl(&server_min_messages, newval, doit, interactive));
+	return (assign_msglvl(&log_min_messages, newval, doit, interactive));
 }
 
 const char *
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index ee721a358a8..ff72af3c259 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -112,7 +112,7 @@
 #
 #	Message display
 #
-#server_min_messages = notice	# Values, in order of decreasing detail:
+#log_min_messages = notice	# Values, in order of decreasing detail:
 				#   debug5, debug4, debug3, debug2, debug1,
 				#   info, notice, warning, error, log, fatal,
 				#   panic
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 4b3e4c13a9b..3c65195de77 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.65 2002/11/08 17:37:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.66 2002/11/14 23:53:27 momjian Exp $
  */
 
 /*----------------------------------------------------------------------
@@ -229,7 +229,7 @@ psql_completion(char *text, int start, int end)
 		"enable_hashjoin",
 		"geqo",
 		"fsync",
-		"server_min_messages",
+		"log_min_messages",
 		"client_min_messages",
 		"debug_assertions",
 		"log_statement",
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 48221bded31..e891580e32b 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -4,7 +4,7 @@
  * External declarations pertaining to backend/utils/misc/guc.c and
  * backend/utils/misc/guc-file.l
  *
- * $Id: guc.h,v 1.24 2002/10/21 18:57:35 petere Exp $
+ * $Id: guc.h,v 1.25 2002/11/14 23:53:27 momjian Exp $
  */
 #ifndef GUC_H
 #define GUC_H
@@ -103,7 +103,7 @@ extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
 extern const char *assign_min_error_statement(const char *newval, bool doit,
 						   bool interactive);
 
-extern const char *assign_server_min_messages(const char *newval,
+extern const char *assign_log_min_messages(const char *newval,
 						   bool doit, bool interactive);
 extern const char *assign_client_min_messages(const char *newval,
 						   bool doit, bool interactive);
@@ -129,9 +129,9 @@ extern int	log_min_error_statement;
 extern char *log_min_error_statement_str;
 extern const char log_min_error_statement_str_default[];
 
-extern int	server_min_messages;
-extern char *server_min_messages_str;
-extern const char server_min_messages_str_default[];
+extern int	log_min_messages;
+extern char *log_min_messages_str;
+extern const char log_min_messages_str_default[];
 
 extern int	client_min_messages;
 extern char *client_min_messages_str;