1
0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00

RESET ALL secondary patch:

Here is Tomified version of my 2 pending patches.
Dropped the set_.._real change as it is not needed.
Desc would be:

* use GUC for settings from cmdline

Marko Kreen
This commit is contained in:
Bruce Momjian
2001-06-18 23:42:32 +00:00
parent 0ed7864d68
commit 3709a5ada7
3 changed files with 49 additions and 49 deletions

View File

@@ -28,7 +28,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.221 2001/06/16 22:58:12 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.222 2001/06/18 23:42:32 momjian Exp $
*
* NOTES
*
@@ -426,14 +426,14 @@ PostmasterMain(int argc, char *argv[])
#ifndef USE_ASSERT_CHECKING
postmaster_error("Assert checking is not compiled in.");
#else
assert_enabled = atoi(optarg);
SetConfigOption("debug_assertions", optarg, PGC_POSTMASTER, true);
#endif
break;
case 'a':
/* Can no longer set authentication method. */
break;
case 'B':
NBuffers = atoi(optarg);
SetConfigOption("shared_buffers", optarg, PGC_POSTMASTER, true);
break;
case 'b':
/* Can no longer set the backend executable file to use. */
@@ -447,23 +447,23 @@ PostmasterMain(int argc, char *argv[])
* Turn on debugging for the postmaster and the backend
* servers descended from it.
*/
DebugLvl = atoi(optarg);
SetConfigOption("debug_level", optarg, PGC_POSTMASTER, true);
break;
case 'F':
enableFsync = false;
SetConfigOption("enable_fsync", optarg, PGC_POSTMASTER, true);
break;
case 'h':
VirtualHost = optarg;
SetConfigOption("virtual_host", optarg, PGC_POSTMASTER, true);
break;
case 'i':
NetServer = true;
SetConfigOption("tcpip_socket", optarg, PGC_POSTMASTER, true);
break;
case 'k':
UnixSocketDir = optarg;
SetConfigOption("unix_socket_directory", optarg, PGC_POSTMASTER, true);
break;
#ifdef USE_SSL
case 'l':
EnableSSL = true;
SetConfigOption("ssl", optarg, PGC_POSTMASTER, true);
break;
#endif
case 'm':
@@ -483,11 +483,7 @@ PostmasterMain(int argc, char *argv[])
* The max number of backends to start. Can't set to less
* than 1 or more than compiled-in limit.
*/
MaxBackends = atoi(optarg);
if (MaxBackends < 1)
MaxBackends = 1;
if (MaxBackends > MAXBACKENDS)
MaxBackends = MAXBACKENDS;
SetConfigOption("max_connections", optarg, PGC_POSTMASTER, true);
break;
case 'n':
/* Don't reinit shared mem after abnormal exit */
@@ -504,7 +500,7 @@ PostmasterMain(int argc, char *argv[])
strcpy(original_extraoptions, optarg);
break;
case 'p':
PostPortNumber = atoi(optarg);
SetConfigOption("port", optarg, PGC_POSTMASTER, true);
break;
case 'S':
@@ -514,7 +510,7 @@ PostmasterMain(int argc, char *argv[])
* it's most badly needed on SysV-derived systems like
* SVR4 and HP-UX.
*/
SilentMode = true;
SetConfigOption("silent_mode", optarg, PGC_POSTMASTER, true);
break;
case 's':