From 3c104bc4ed82afc19fde34de7fa8d242c75e8771 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 26 Sep 2002 05:17:00 +0000
Subject: [PATCH] Pass postmaster -d down to the postgres backend to trigger
special -d handling in the backend.
---
src/backend/postmaster/postmaster.c | 15 ++++++++++++++-
src/backend/tcop/postgres.c | 7 +++----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 85139188b23..5f02759c5d8 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.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
index 6b49bdba6c5..99b6a4fb2ce 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.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");
}
/*
--
GitLab