database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-20 05:03:10 +03:00
Code Activity

Cleanup -is flag to -l for SSL. Another PERL variable name fix. Clean

Browse Source 
up debugging options for postmaster and postgres programs.  postmaster
-d is no longer optional.  Documentation updates.
This commit is contained in:
Bruce Momjian
1999-10-08 04:28:57 +00:00
parent 5ce158c534
commit ae61ef34bd
6 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/backend/postmaster/postmaster.c
View File

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.123 1999/10/08 02:16:22 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.124 1999/10/08 04:28:43 momjian Exp $
*
* NOTES
*
@ -412,7 +412,7 @@ PostmasterMain(int argc, char *argv[])
DataDir = getenv("PGDATA"); /* default value */
opterr = 0;
while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:di::m:MN:no:p:Ss")) != EOF)
while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:d:ilm:MN:no:p:Ss")) != EOF)
{
switch (opt)
{
@ -459,27 +459,21 @@ PostmasterMain(int argc, char *argv[])
DataDir = optarg;
break;
case 'd':
/*
* Turn on debugging for the postmaster and the backend
* servers descended from it.
*/
if ((optind < nonblank_argc) && *argv[optind] != '-')
{
DebugLvl = atoi(argv[optind]);
optind++;
}
else
DebugLvl = 1;
DebugLvl = atoi(optarg);
pg_options[TRACE_VERBOSE] = DebugLvl;
break;
case 'i':
NetServer = true;
#ifdef USE_SSL
if (optarg && !strcasecmp(optarg,"s"))
SecureNetServer = true;
#endif
break;
#ifdef USE_SSL
case 'l':
SecureNetServer = true;
break;
#endif
case 'm':
/* Multiplexed backends no longer supported. */
break;
@ -581,6 +575,12 @@ PostmasterMain(int argc, char *argv[])
}
#ifdef USE_SSL
if (!NetServer && SecureNetServer)
{
fprintf(stderr, "For SSL, you must enable TCP/IP connections.\n",
argv[0]);
exit(1);
}
InitSSL();
#endif
@ -689,7 +689,7 @@ usage(const char *progname)
fprintf(stderr, "\t-d [1|2|3]\tset debugging level\n");
fprintf(stderr, "\t-i \t\tlisten on TCP/IP sockets as well as Unix domain socket\n");
#ifdef USE_SSL
fprintf(stderr," \t-is\t\tlisten on TCP/IP sockets as above, but only SSL connections\n");
fprintf(stderr," \t-l \t\tfor TCP/IP sockets, listen only on SSL connections\n");
#endif
fprintf(stderr, "\t-N nprocs\tset max number of backends (1..%d, default %d)\n",
MAXBACKENDS, DEF_MAXBACKENDS);
@ -1669,22 +1669,18 @@ BackendStartup(Port *port)
static void
split_opts(char **argv, int *argcp, char *s)
{
int i = *argcp;
while (s && *s)
{
while (isspace(*s))
++s;
if (*s == '\0')
break;
argv[i++] = s;
argv[(*argcp)++] = s;
while (*s && !isspace(*s))
++s;
if (*s)
*s++ = '\0';
}
*argcp = i;
}
/*

20
src/backend/tcop/postgres.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.131 1999/10/06 21:58:08 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.132 1999/10/08 04:28:45 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -130,7 +130,7 @@ bool ExitAfterAbort = false;
extern int NBuffers;
static int EchoQuery = 0; /* default don't echo */
static bool EchoQuery = false; /* default don't echo */
time_t tim;
char pg_pathname[256];
FILE *StatFp;
@ -901,7 +901,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
char *DBDate = NULL;
extern int optind;
extern char *optarg;
extern short DebugLvl;
extern int DebugLvl;
/*
* Set default values for command-line options.
@ -1017,13 +1017,13 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
break;
case 'd': /* debug level */
DebugLvl = (short) atoi(optarg);
DebugLvl = atoi(optarg);
if (DebugLvl >= 1)
Verbose = DebugLvl;
Verbose = true;
if (DebugLvl >= 2)
DebugPrintQuery = true;
if (DebugLvl >= 3)
DebugPrintQuery = DebugLvl;
DebugPrintQuery = true ;
if (DebugLvl >= 4)
{
DebugPrintParse = true;
@ -1157,7 +1157,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
* Q - set Quiet mode (reduce debugging output)
* ----------------
*/
Verbose = 0;
Verbose = false;
break;
case 'S':
@ -1443,7 +1443,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
*/
if (Verbose)
{
if (Verbose == 1)
if (Verbose)
{
TPRINTF(TRACE_VERBOSE, "started: host=%s user=%s database=%s",
remote_host, userName, DBName);
@ -1455,7 +1455,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
TPRINTF(TRACE_VERBOSE, "\tRemoteHost = %s", remote_host);
TPRINTF(TRACE_VERBOSE, "\tRemotePort = %d", remote_port);
TPRINTF(TRACE_VERBOSE, "\tDatabaseName = %s", DBName);
TPRINTF(TRACE_VERBOSE, "\tVerbose = %d", Verbose);
TPRINTF(TRACE_VERBOSE, "\tDebug Level = %d", DebugLvl);
TPRINTF(TRACE_VERBOSE, "\tNoversion = %c", Noversion ? 't' : 'f');
TPRINTF(TRACE_VERBOSE, "\ttimings = %c", ShowStats ? 't' : 'f');
TPRINTF(TRACE_VERBOSE, "\tdates = %s",
@ -1508,7 +1508,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.131 $ $Date: 1999/10/06 21:58:08 $\n");
puts("$Revision: 1.132 $ $Date: 1999/10/08 04:28:45 $\n");
}
/*

4
src/backend/utils/init/globals.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.37 1999/09/27 20:27:09 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.38 1999/10/08 04:28:48 momjian Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@ -63,7 +63,7 @@ bool TransactionInitWasProcessed = false;
bool IsUnderPostmaster = false;
short DebugLvl = 0;
int DebugLvl = 0;
int DateStyle = USE_POSTGRES_DATES;
bool EuroDates = false;