Commit d0e4a076 authored by Tom Lane's avatar Tom Lane

Make the order of operations in PostmasterMain a bit saner ... some

recent patches had added stuff in rather random spots.
parent e85b5dae
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.495 2006/07/16 18:17:14 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.496 2006/07/25 01:23:34 tgl Exp $
* *
* NOTES * NOTES
* *
...@@ -813,6 +813,12 @@ PostmasterMain(int argc, char *argv[]) ...@@ -813,6 +813,12 @@ PostmasterMain(int argc, char *argv[])
*/ */
set_max_safe_fds(); set_max_safe_fds();
/*
* Load configuration files for client authentication.
*/
load_hba();
load_ident();
/* /*
* Initialize the list of active backends. * Initialize the list of active backends.
*/ */
...@@ -920,20 +926,15 @@ PostmasterMain(int argc, char *argv[]) ...@@ -920,20 +926,15 @@ PostmasterMain(int argc, char *argv[])
whereToSendOutput = DestNone; whereToSendOutput = DestNone;
/* /*
* Initialize the statistics collector stuff * Initialize stats collection subsystem (this does NOT start the
* collector process!)
*/ */
pgstat_init(); pgstat_init();
/* /*
* Load configuration files for client authentication. * Initialize the autovacuum subsystem (again, no process start yet)
*/
load_hba();
load_ident();
/*
* We're ready to rock and roll...
*/ */
StartupPID = StartupDataBase(); autovac_init();
/* /*
* Remember postmaster startup time * Remember postmaster startup time
...@@ -941,9 +942,9 @@ PostmasterMain(int argc, char *argv[]) ...@@ -941,9 +942,9 @@ PostmasterMain(int argc, char *argv[])
PgStartTime = GetCurrentTimestamp(); PgStartTime = GetCurrentTimestamp();
/* /*
* Initialize the autovacuum daemon * We're ready to rock and roll...
*/ */
autovac_init(); StartupPID = StartupDataBase();
status = ServerLoop(); status = ServerLoop();
......
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