|
37 | 37 | *
|
38 | 38 | *
|
39 | 39 | * IDENTIFICATION
|
40 |
| - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.495 2006/07/16 18:17:14 tgl Exp $ |
| 40 | + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.496 2006/07/25 01:23:34 tgl Exp $ |
41 | 41 | *
|
42 | 42 | * NOTES
|
43 | 43 | *
|
@@ -813,6 +813,12 @@ PostmasterMain(int argc, char *argv[])
|
813 | 813 | */
|
814 | 814 | set_max_safe_fds();
|
815 | 815 |
|
| 816 | +/* |
| 817 | + * Load configuration files for client authentication. |
| 818 | + */ |
| 819 | +load_hba(); |
| 820 | +load_ident(); |
| 821 | + |
816 | 822 | /*
|
817 | 823 | * Initialize the list of active backends.
|
818 | 824 | */
|
@@ -920,30 +926,25 @@ PostmasterMain(int argc, char *argv[])
|
920 | 926 | whereToSendOutput=DestNone;
|
921 | 927 |
|
922 | 928 | /*
|
923 |
| - * Initialize the statistics collector stuff |
| 929 | + * Initialize stats collection subsystem (this does NOT start the |
| 930 | + * collector process!) |
924 | 931 | */
|
925 | 932 | pgstat_init();
|
926 | 933 |
|
927 | 934 | /*
|
928 |
| - * Load configuration files for client authentication. |
929 |
| - */ |
930 |
| -load_hba(); |
931 |
| -load_ident(); |
932 |
| - |
933 |
| -/* |
934 |
| - * We're ready to rock and roll... |
| 935 | + * Initialize the autovacuum subsystem (again, no process start yet) |
935 | 936 | */
|
936 |
| -StartupPID=StartupDataBase(); |
| 937 | +autovac_init(); |
937 | 938 |
|
938 | 939 | /*
|
939 | 940 | * Remember postmaster startup time
|
940 | 941 | */
|
941 | 942 | PgStartTime=GetCurrentTimestamp();
|
942 | 943 |
|
943 | 944 | /*
|
944 |
| - *Initialize the autovacuum daemon |
| 945 | + *We're ready to rock and roll... |
945 | 946 | */
|
946 |
| -autovac_init(); |
| 947 | +StartupPID=StartupDataBase(); |
947 | 948 |
|
948 | 949 | status=ServerLoop();
|
949 | 950 |
|
|