diff options
Diffstat (limited to 'src/bin/pg_upgrade/pg_upgrade.c')
| -rw-r--r-- | src/bin/pg_upgrade/pg_upgrade.c | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c index 265d829490..115faa222e 100644 --- a/src/bin/pg_upgrade/pg_upgrade.c +++ b/src/bin/pg_upgrade/pg_upgrade.c @@ -81,6 +81,10 @@ main(int argc, char **argv) char *deletion_script_file_name = NULL; bool live_check = false; + /* + * pg_upgrade doesn't currently use common/logging.c, but initialize it + * anyway because we might call common code that does. + */ pg_logging_init(argv[0]); set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_upgrade")); @@ -99,7 +103,7 @@ main(int argc, char **argv) * output directories with correct permissions. */ if (!GetDataDirectoryCreatePerm(new_cluster.pgdata)) - pg_fatal("could not read permissions of directory \"%s\": %s\n", + pg_fatal("could not read permissions of directory \"%s\": %s", new_cluster.pgdata, strerror(errno)); umask(pg_mode_mask); @@ -133,7 +137,7 @@ main(int argc, char **argv) pg_log(PG_REPORT, "\n" "Performing Upgrade\n" - "------------------\n"); + "------------------"); prepare_new_cluster(); @@ -197,7 +201,7 @@ main(int argc, char **argv) pg_log(PG_REPORT, "\n" "Upgrade Complete\n" - "----------------\n"); + "----------------"); output_completion_banner(deletion_script_file_name); @@ -228,7 +232,7 @@ make_outputdirs(char *pgdata) log_opts.rootdir = (char *) pg_malloc0(MAXPGPATH); len = snprintf(log_opts.rootdir, MAXPGPATH, "%s/%s", pgdata, BASE_OUTPUTDIR); if (len >= MAXPGPATH) - pg_fatal("directory path for new cluster is too long\n"); + pg_fatal("directory path for new cluster is too long"); /* BASE_OUTPUTDIR/$timestamp/ */ gettimeofday(&time, NULL); @@ -241,42 +245,42 @@ make_outputdirs(char *pgdata) len = snprintf(log_opts.basedir, MAXPGPATH, "%s/%s", log_opts.rootdir, timebuf); if (len >= MAXPGPATH) - pg_fatal("directory path for new cluster is too long\n"); + pg_fatal("directory path for new cluster is too long"); /* BASE_OUTPUTDIR/$timestamp/dump/ */ log_opts.dumpdir = (char *) pg_malloc0(MAXPGPATH); len = snprintf(log_opts.dumpdir, MAXPGPATH, "%s/%s/%s", log_opts.rootdir, timebuf, DUMP_OUTPUTDIR); if (len >= MAXPGPATH) - pg_fatal("directory path for new cluster is too long\n"); + pg_fatal("directory path for new cluster is too long"); /* BASE_OUTPUTDIR/$timestamp/log/ */ log_opts.logdir = (char *) pg_malloc0(MAXPGPATH); len = snprintf(log_opts.logdir, MAXPGPATH, "%s/%s/%s", log_opts.rootdir, timebuf, LOG_OUTPUTDIR); if (len >= MAXPGPATH) - pg_fatal("directory path for new cluster is too long\n"); + pg_fatal("directory path for new cluster is too long"); /* * Ignore the error case where the root path exists, as it is kept the * same across runs. */ if (mkdir(log_opts.rootdir, pg_dir_create_mode) < 0 && errno != EEXIST) - pg_fatal("could not create directory \"%s\": %m\n", log_opts.rootdir); + pg_fatal("could not create directory \"%s\": %m", log_opts.rootdir); if (mkdir(log_opts.basedir, pg_dir_create_mode) < 0) - pg_fatal("could not create directory \"%s\": %m\n", log_opts.basedir); + pg_fatal("could not create directory \"%s\": %m", log_opts.basedir); if (mkdir(log_opts.dumpdir, pg_dir_create_mode) < 0) - pg_fatal("could not create directory \"%s\": %m\n", log_opts.dumpdir); + pg_fatal("could not create directory \"%s\": %m", log_opts.dumpdir); if (mkdir(log_opts.logdir, pg_dir_create_mode) < 0) - pg_fatal("could not create directory \"%s\": %m\n", log_opts.logdir); + pg_fatal("could not create directory \"%s\": %m", log_opts.logdir); len = snprintf(filename_path, sizeof(filename_path), "%s/%s", log_opts.logdir, INTERNAL_LOG_FILE); if (len >= sizeof(filename_path)) - pg_fatal("directory path for new cluster is too long\n"); + pg_fatal("directory path for new cluster is too long"); if ((log_opts.internal = fopen_priv(filename_path, "a")) == NULL) - pg_fatal("could not open log file \"%s\": %m\n", filename_path); + pg_fatal("could not open log file \"%s\": %m", filename_path); /* label start of upgrade in logfiles */ for (filename = output_files; *filename != NULL; filename++) @@ -284,9 +288,9 @@ make_outputdirs(char *pgdata) len = snprintf(filename_path, sizeof(filename_path), "%s/%s", log_opts.logdir, *filename); if (len >= sizeof(filename_path)) - pg_fatal("directory path for new cluster is too long\n"); + pg_fatal("directory path for new cluster is too long"); if ((fp = fopen_priv(filename_path, "a")) == NULL) - pg_fatal("could not write to log file \"%s\": %m\n", filename_path); + pg_fatal("could not write to log file \"%s\": %m", filename_path); fprintf(fp, "-----------------------------------------------------------------\n" @@ -317,7 +321,7 @@ setup(char *argv0, bool *live_check) char exec_path[MAXPGPATH]; if (find_my_exec(argv0, exec_path) < 0) - pg_fatal("%s: could not find own program executable\n", argv0); + pg_fatal("%s: could not find own program executable", argv0); /* Trim off program name and keep just path */ *last_dir_separator(exec_path) = '\0'; canonicalize_path(exec_path); @@ -344,7 +348,7 @@ setup(char *argv0, bool *live_check) { if (!user_opts.check) pg_fatal("There seems to be a postmaster servicing the old cluster.\n" - "Please shutdown that postmaster and try again.\n"); + "Please shutdown that postmaster and try again."); else *live_check = true; } @@ -357,7 +361,7 @@ setup(char *argv0, bool *live_check) stop_postmaster(false); else pg_fatal("There seems to be a postmaster servicing the new cluster.\n" - "Please shutdown that postmaster and try again.\n"); + "Please shutdown that postmaster and try again."); } } @@ -529,7 +533,7 @@ remove_new_subdir(const char *subdir, bool rmtopdir) snprintf(new_path, sizeof(new_path), "%s/%s", new_cluster.pgdata, subdir); if (!rmtree(new_path, rmtopdir)) - pg_fatal("could not delete directory \"%s\"\n", new_path); + pg_fatal("could not delete directory \"%s\"", new_path); check_ok(); } |