summaryrefslogtreecommitdiff
path: root/src/bin/pg_upgrade/server.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2018-01-05 14:11:15 -0500
committerBruce Momjian <bruce@momjian.us>2018-01-05 14:11:15 -0500
commit959ee6d267fb24e667fc64e9837a376e236e84a5 (patch)
tree3c278930f59ec9bec298ae91a72f5b1824858c9c /src/bin/pg_upgrade/server.c
parentdf9f682c7bf81674b6ae3900fd0146f35df0ae2e (diff)
pg_upgrade: simplify code layout in a few places
Backpatch-through: 9.4 (9.3 didn't need improving)
Diffstat (limited to 'src/bin/pg_upgrade/server.c')
-rw-r--r--src/bin/pg_upgrade/server.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 96181237f8d..1b399a9841e 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -310,12 +310,8 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
* running.
*/
if (!pg_ctl_return)
- {
- if (cluster == &old_cluster)
- pg_fatal("pg_ctl failed to start the source server, or connection failed\n");
- else
- pg_fatal("pg_ctl failed to start the target server, or connection failed\n");
- }
+ pg_fatal("pg_ctl failed to start the %s server, or connection failed\n",
+ cluster == &old_cluster ? "source" : "target");
return true;
}