diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-08-10 17:26:44 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-08-10 17:27:15 -0400 |
| commit | c9b0cbe98bd783e24a8c4d8d8ac472a494b81292 (patch) | |
| tree | 1d4459d614fe104efa5c8d6881b5ef347a523b11 /src/backend/utils/misc/guc.c | |
| parent | 85642ec00b5e0c58d2504b10c079693b8fb28cc5 (diff) | |
| download | postgresql-c9b0cbe98bd783e24a8c4d8d8ac472a494b81292.tar.gz postgresql-c9b0cbe98bd783e24a8c4d8d8ac472a494b81292.zip | |
Support having multiple Unix-domain sockets per postmaster.
Replace unix_socket_directory with unix_socket_directories, which is a list
of socket directories, and adjust postmaster's code to allow zero or more
Unix-domain sockets to be created.
This is mostly a straightforward change, but since the Unix sockets ought
to be created after the TCP/IP sockets for safety reasons (better chance
of detecting a port number conflict), AddToDataDirLockFile needs to be
fixed to support out-of-order updates of data directory lockfile lines.
That's a change that had been foreseen to be necessary someday anyway.
Honza Horak, reviewed and revised by Tom Lane
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 087aaf9b0bb..80e5aa1816f 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -2895,14 +2895,18 @@ static struct config_string ConfigureNamesString[] = }, { - {"unix_socket_directory", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("Sets the directory where the Unix-domain socket will be created."), + {"unix_socket_directories", PGC_POSTMASTER, CONN_AUTH_SETTINGS, + gettext_noop("Sets the directories where Unix-domain sockets will be created."), NULL, GUC_SUPERUSER_ONLY }, - &UnixSocketDir, + &Unix_socket_directories, +#ifdef HAVE_UNIX_SOCKETS + DEFAULT_PGSOCKET_DIR, +#else "", - check_canonical_path, NULL, NULL +#endif + NULL, NULL, NULL }, { |