Skip to content

P
Postgres FD Implementation
Commit 8a9315ca authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Update and polish postmaster and postgres help output and man pages.

parent 3eaf3363
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 535 additions and 608 deletions
doc/src/sgml/ref/postgres-ref.sgml
View file @ 8a9315ca
This diff is collapsed.
doc/src/sgml/ref/postmaster.sgml
View file @ 8a9315ca
This diff is collapsed.
doc/src/sgml/runtime.sgml
View file @ 8a9315ca
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.34 2000/11/13 21:35:02 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.35 2000/11/14 18:11:30 petere Exp $
--> -->
<Chapter Id="runtime"> <Chapter Id="runtime">
...@@ -930,7 +930,34 @@ env PGOPTIONS='-c geqo=off' psql ...@@ -930,7 +930,34 @@ env PGOPTIONS='-c geqo=off' psql
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>KRB_SERVER_KEYFILE</> <term>HOSTNAME (<type>string</type>)</term>
<listitem>
<para>
Specifies the TCP/IP hostname or address on which the
<application>postmaster</application> is to listen for
connections from client applications. Defaults to the value
of the <envar>PGHOST</envar> environment variable, or if
<envar>PGHOST</envar> is not set, it defaults to listening on
all configured addresses (including localhost).
</para>
<para>
If you use a hostname do not try to run multiple instances of
<application>postmaster</application> on the same IP address
but different ports. Doing so will result in them attempting
(incorrectly) to use the same shared memory segments. Also,
if you use a hostname, all of the host's IP addresses on which
<application>postmaster</application> instances are listening
must be distinct in the two last octets.
</para>
<para>
If you do not use this option, then each instance must listen
on a different port.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>KRB_SERVER_KEYFILE (<type>string</type>)</term>
<listitem> <listitem>
<para> <para>
Sets the location of the Kerberos server key file. See Sets the location of the Kerberos server key file. See
...@@ -1056,6 +1083,21 @@ env PGOPTIONS='-c geqo=off' psql ...@@ -1056,6 +1083,21 @@ env PGOPTIONS='-c geqo=off' psql
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>UNIXSOCKET (<type>string</type>)</term>
<listitem>
<para>
Specifies the Unix domain socket file name on which the
<application>postmaster</application> is to listen for
connections from client applications. Defaults to the value
of the <envar>PGUNIXSOCKET</envar> environment variable, or if
<envar>PGUNIXSOCKET</envar> is not set, then defaults to a
file in <filename>/tmp</filename> constructed from the port
number.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term>UNIX_SOCKET_GROUP (<type>string</type>)</term> <term>UNIX_SOCKET_GROUP (<type>string</type>)</term>
<listitem> <listitem>
......
src/backend/postmaster/postmaster.c
View file @ 8a9315ca
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.185 2000/11/14 01:15:01 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.186 2000/11/14 18:11:31 petere Exp $
* *
* NOTES * NOTES
* *
...@@ -790,30 +790,30 @@ static void ...@@ -790,30 +790,30 @@ static void
usage(const char *progname) usage(const char *progname)
{ {
printf("%s is the PostgreSQL server.\n\n", progname); printf("%s is the PostgreSQL server.\n\n", progname);
printf("Usage:\n %s [options]\n\n", progname); printf("Usage:\n %s [options...]\n\n", progname);
printf("Options:\n"); printf("Options:\n");
#ifdef USE_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
printf(" -A 1|0 enable/disable runtime assert checking\n"); printf(" -A 1|0 enable/disable run-time assert checking\n");
#endif #endif
printf(" -B <buffers> number of shared buffers\n"); printf(" -B NBUFFERS number of shared buffers (default %d)\n", DEF_NBUFFERS);
printf(" -c <name>=<value> set run-time parameter\n"); printf(" -c NAME=VALUE set run-time parameter\n");
printf(" -d 1-5 debugging level\n"); printf(" -d 1-5 debugging level\n");
printf(" -D <directory> database directory\n"); printf(" -D DATADIR database directory\n");
printf(" -F turn fsync off\n"); printf(" -F turn fsync off\n");
printf(" -h hostname specify hostname or IP address\n"); printf(" -h HOSTNAME host name or IP address to listen to\n");
printf(" -i enable TCP/IP connections\n"); printf(" -i enable TCP/IP connections\n");
printf(" -k path specify Unix-domain socket name\n"); printf(" -k FILENAME Unix domain socket location\n");
#ifdef USE_SSL #ifdef USE_SSL
printf(" -l enable SSL connections\n"); printf(" -l enable SSL connections\n");
#endif #endif
printf(" -N <number> maximum number of allowed connections (1..%d, default %d)\n", printf(" -N MAX-CONNECT maximum number of allowed connections (1..%d, default %d)\n",
MAXBACKENDS, DEF_MAXBACKENDS); MAXBACKENDS, DEF_MAXBACKENDS);
printf(" -o <option> pass 'option' to each backend server\n"); printf(" -o OPTIONS pass 'OPTIONS' to each backend server\n");
printf(" -p <port> port number to listen on\n"); printf(" -p PORT port number to listen on (default %d)\n", DEF_PGPORT);
printf(" -S silent mode (dissociate from tty)\n"); printf(" -S silent mode (start in background without logging output)\n");
printf("\nDeveloper options:\n"); printf("\nDeveloper options:\n");
printf(" -n don't reinitialize shared memory after abnormal exit\n"); printf(" -n do not reinitialize shared memory after abnormal exit\n");
printf(" -s send SIGSTOP to all backend servers if one dies\n"); printf(" -s send SIGSTOP to all backend servers if one dies\n");
printf("\nPlease read the documentation for the complete list of run-time\n" printf("\nPlease read the documentation for the complete list of run-time\n"
......
src/backend/tcop/postgres.c
View file @ 8a9315ca
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.187 2000/11/08 17:57:46 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.188 2000/11/14 18:11:32 petere Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
...@@ -1001,38 +1001,41 @@ SigHupHandler(SIGNAL_ARGS) ...@@ -1001,38 +1001,41 @@ SigHupHandler(SIGNAL_ARGS)
} }
static void static void
usage(char *progname) usage(char *progname)
{ {
fprintf(stderr, printf("%s is the PostgreSQL stand-alone backend. It is not\nintended to be used by normal users.\n\n", progname);
"Usage: %s [options] [dbname]\n", progname);
printf("Usage:\n %s [options...] [dbname]\n\n", progname);
printf("Options:\n");
#ifdef USE_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
fprintf(stderr, "\t-A on\t\tenable/disable assert checking\n"); printf(" -A 1|0 enable/disable run-time assert checking\n");
#endif #endif
fprintf(stderr, "\t-B buffers\tset number of buffers in buffer pool\n"); printf(" -B NBUFFERS number of shared buffers (default %d)\n", DEF_NBUFFERS);
fprintf(stderr, "\t-c name=value\tset run-time parameter\n"); printf(" -c NAME=VALUE set run-time parameter\n");
fprintf(stderr, "\t-C \t\tsuppress version info\n"); printf(" -d 1-5 debugging level\n");
fprintf(stderr, "\t-D dir\t\tdata directory\n"); printf(" -D DATADIR database directory\n");
fprintf(stderr, "\t-E \t\techo query before execution\n"); printf(" -e use European date format\n");
fprintf(stderr, "\t-F \t\tturn fsync off\n"); printf(" -E echo query before execution\n");
fprintf(stderr, "\t-L \t\tturn off locking\n"); printf(" -F turn fsync off\n");
fprintf(stderr, "\t-N \t\tdon't use newline as interactive query delimiter\n"); printf(" -N do not use newline as interactive query delimiter\n");
fprintf(stderr, "\t-O \t\tallow system table structure changes\n"); printf(" -o FILENAME send stdout and stderr to given file\n");
fprintf(stderr, "\t-Q \t\tsuppress informational messages\n"); printf(" -P disable system indexes\n");
fprintf(stderr, "\t-S kbytes\tset amount of memory for sorts (in kbytes)\n"); printf(" -s show statistics after each query\n");
fprintf(stderr, "\t-T options\tspecify pg_options\n"); printf(" -S SORT-MEM set amount of memory for sorts (in kbytes)\n");
fprintf(stderr, "\t-W sec\t\twait N seconds to allow attach from a debugger\n"); printf("Developer options:\n");
fprintf(stderr, "\t-d [1-5]\tset debug level\n"); printf(" -f [s|i|n|m|h] forbid use of some plan types\n");
fprintf(stderr, "\t-e \t\tturn on European date format\n"); printf(" -i do not execute queries\n");
fprintf(stderr, "\t-f [s|i|n|m|h]\tforbid use of some plan types\n"); printf(" -L turn off locking\n");
fprintf(stderr, "\t-i \t\tdon't execute queries\n"); printf(" -O allow system table structure changes\n");
fprintf(stderr, "\t-o file\t\tsend stdout and stderr to given filename\n"); printf(" -t [pa|pl|ex] show timings after each query\n");
fprintf(stderr, "\t-p database\tbackend is started under a postmaster\n"); printf(" -W NUM wait NUM seconds to allow attach from a debugger\n");
fprintf(stderr, "\t-s \t\tshow stats after each query\n"); printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");
fprintf(stderr, "\t-t [pa|pl|ex]\tshow timings after each query\n");
fprintf(stderr, "\t-v version\tset protocol version being used by frontend\n");
} }
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* PostgresMain * PostgresMain
* postgres main loop -- all backends, interactive or otherwise start here * postgres main loop -- all backends, interactive or otherwise start here
...@@ -1646,7 +1649,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha ...@@ -1646,7 +1649,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.187 $ $Date: 2000/11/08 17:57:46 $\n"); puts("$Revision: 1.188 $ $Date: 2000/11/14 18:11:32 $\n");
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment