Pass postmaster -d down to the postgres backend to trigger special -d

bmomjian · bmomjian · commit 3c104bc4ed82 · 2002-09-26T05:17:00.000Z
handling in the backend.
diff --git 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.288 2002/09/04 20:31:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.289 2002/09/26 05:17:00 momjian Exp $
  *
  * NOTES
  *
@@ -230,6 +230,8 @@ bool		ClientAuthInProgress = false;		/* T during new-client
 
 static unsigned int random_seed = 0;
 
+static int	debug_flag = 0;
+
 extern char *optarg;
 extern int	optind,
 			opterr;
@@ -452,6 +454,7 @@ PostmasterMain(int argc, char *argv[])
 					SetConfigOption("server_min_messages", debugstr,
 									PGC_POSTMASTER, PGC_S_ARGV);
 					pfree(debugstr);
+					debug_flag = atoi(optarg);
 					break;
 				}
 			case 'F':
@@ -2028,6 +2031,7 @@ DoBackend(Port *port)
 	char	   *remote_host;
 	char	   *av[ARGV_SIZE * 2];
 	int			ac = 0;
+	char		debugbuf[ARGV_SIZE];
 	char		protobuf[ARGV_SIZE];
 	char		dbbuf[ARGV_SIZE];
 	char		optbuf[ARGV_SIZE];
@@ -2208,6 +2212,15 @@ DoBackend(Port *port)
 
 	av[ac++] = "postgres";
 
+	/*
+	 * Pass the requested debugging level along to the backend.
+	 */
+	if (debug_flag > 0)
+	{
+		sprintf(debugbuf, "-d%d", debug_flag);
+		av[ac++] = debugbuf;
+	}
+
 	/*
 	 * Pass any backend switches specified with -o in the postmaster's own
 	 * command line.  We assume these are secure. (It's OK to mangle
diff --git 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.294 2002/09/25 20:31:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.295 2002/09/26 05:17:00 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1281,8 +1281,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 						 * -d 0 allows user to prevent postmaster debug
 						 * from propagating to backend.
 						 */
-						SetConfigOption("server_min_messages", "notice",
-										ctx, gucsource);
+						ResetPGVariable("server_min_messages");
 				}
 				break;
 
@@ -1698,7 +1697,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.294 $ $Date: 2002/09/25 20:31:40 $\n");
+		puts("$Revision: 1.295 $ $Date: 2002/09/26 05:17:00 $\n");
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.294 2002/09/25 20:31:40 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.295 2002/09/26 05:17:00 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1281,8 +1281,7 @@ PostgresMain(int argc, char argv[], const char username)`
`1281`	`1281`	`* -d 0 allows user to prevent postmaster debug`
`1282`	`1282`	`* from propagating to backend.`
`1283`	`1283`	`*/`
`1284`		`- SetConfigOption("server_min_messages", "notice",`
`1285`		`- ctx, gucsource);`
	`1284`	`+ ResetPGVariable("server_min_messages");`
`1286`	`1285`	`}`
`1287`	`1286`	`break;`
`1288`	`1287`
`@@ -1698,7 +1697,7 @@ PostgresMain(int argc, char argv[], const char username)`
`1698`	`1697`	`if (!IsUnderPostmaster)`
`1699`	`1698`	`{`
`1700`	`1699`	`puts("\nPOSTGRES backend interactive interface ");`
`1701`		`- puts("$Revision: 1.294 $ $Date: 2002/09/25 20:31:40 $\n");`
	`1700`	`+ puts("$Revision: 1.295 $ $Date: 2002/09/26 05:17:00 $\n");`
`1702`	`1701`	`}`
`1703`	`1702`
`1704`	`1703`	`/*`