diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-04-25 20:17:48 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-04-25 20:18:23 -0400 |
| commit | 44091442db7e0d9fd7f0495f09d725fc92d940b5 (patch) | |
| tree | 32223b6feb446dc2c9a4214f2e1dc83706d14739 /contrib/pg_upgrade/server.c | |
| parent | 6dab96abaa8bd6775658d26517e288f4d5f6448f (diff) | |
In pg_upgrade, avoid one start/stop of the postmaster; use the -w
(wait) flag for pg_ctl start/stop; remove the unused "quiet" flag in
the functions for starting/stopping the postmaster.
Diffstat (limited to 'contrib/pg_upgrade/server.c')
| -rw-r--r-- | contrib/pg_upgrade/server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c index ab8d8c73342..0c9914b413e 100644 --- a/contrib/pg_upgrade/server.c +++ b/contrib/pg_upgrade/server.c @@ -160,13 +160,13 @@ stop_postmaster_atexit(void) stop_postmaster_on_exit(int exitstatus, void *arg) #endif { - stop_postmaster(true, true); + stop_postmaster(true); } void -start_postmaster(ClusterInfo *cluster, bool quiet) +start_postmaster(ClusterInfo *cluster) { char cmd[MAXPGPATH]; const char *bindir; @@ -205,7 +205,7 @@ start_postmaster(ClusterInfo *cluster, bool quiet) * not touch them. */ snprintf(cmd, sizeof(cmd), - SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" " + SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" " "-o \"-p %d %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE, bindir, output_filename, datadir, port, (cluster->controldata.cat_ver >= @@ -228,7 +228,7 @@ start_postmaster(ClusterInfo *cluster, bool quiet) void -stop_postmaster(bool fast, bool quiet) +stop_postmaster(bool fast) { char cmd[MAXPGPATH]; const char *bindir; @@ -249,7 +249,7 @@ stop_postmaster(bool fast, bool quiet) /* See comment in start_postmaster() about why win32 output is ignored. */ snprintf(cmd, sizeof(cmd), - SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" %s stop >> " + SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" %s stop >> " "\"%s\" 2>&1" SYSTEMQUOTE, bindir, #ifndef WIN32 |