diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-20 20:06:03 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-20 20:06:03 +0000 |
commit | ea19eb999d7121aba8eefce98051c7cafa376d6d (patch) | |
tree | bb9774bfd430568c956def437874c12461ce222b /src/backend/bootstrap/bootstrap.c | |
parent | 09290098c5a44f5b98f328740dddaac726f68dcc (diff) | |
download | postgresql-ea19eb999d7121aba8eefce98051c7cafa376d6d.tar.gz postgresql-ea19eb999d7121aba8eefce98051c7cafa376d6d.zip |
Postpone pg_timezone_initialize() until after creation of postmaster.pid,
since it can take a fair amount of time and this can confuse boot scripts
that expect postmaster.pid to appear quickly. Move initialization of SSL
library and preloaded libraries to after that point, too, just for luck.
Per reports from Tony Caduto and others.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
-rw-r--r-- | src/backend/bootstrap/bootstrap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 47d68518ec8..316ce270c21 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.198 2005/01/14 21:08:44 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.198.4.1 2005/10/20 20:06:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -354,6 +354,8 @@ BootstrapMain(int argc, char *argv[]) { if (!SelectConfigFiles(userDoption, progname)) proc_exit(1); + /* If timezone is not set, determine what the OS uses */ + pg_timezone_initialize(); } /* Validate we have been given a reasonable-looking DataDir */ |