pg_upgrade: Improve error messages

petere · petere · commit cd917ffb9a43 · 2019-06-19T21:50:24.000+02:00
Make wording more accurate and add strerror() information. Discussion: https://www.postgresql.org/message-id/24c8bd05-aed1-6301-919d-8acbabdb8c24@2ndquadrant.com
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
@@ -146,7 +146,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 #endif
 
 	if (log == NULL)
-		pg_fatal("could not write to log file \"%s\"\n", log_file);
+		pg_fatal("could not open log file \"%s\": %m\n", log_file);
 
 #ifdef WIN32
 	/* Are we printing "command:" before its output? */
@@ -201,7 +201,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 	 * log these commands to a third file, but that just adds complexity.
 	 */
 	if ((log = fopen(log_file, "a")) == NULL)
-		pg_fatal("could not write to log file \"%s\"\n", log_file);
+		pg_fatal("could not write to log file \"%s\": %m\n", log_file);
 	fprintf(log, "\n\n");
 	fclose(log);
 #endif
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
@@ -217,7 +217,7 @@ parseCommandLine(int argc, char *argv[])
 	}
 
 	if ((log_opts.internal = fopen_priv(INTERNAL_LOG_FILE, "a")) == NULL)
-		pg_fatal("could not write to log file \"%s\"\n", INTERNAL_LOG_FILE);
+		pg_fatal("could not open log file \"%s\": %m\n", INTERNAL_LOG_FILE);
 
 	if (log_opts.verbose)
 		pg_log(PG_REPORT, "Running in verbose mode\n");
@@ -226,7 +226,7 @@ parseCommandLine(int argc, char *argv[])
 	for (filename = output_files; *filename != NULL; filename++)
 	{
 		if ((fp = fopen_priv(*filename, "a")) == NULL)
-			pg_fatal("could not write to log file \"%s\"\n", *filename);
+			pg_fatal("could not write to log file \"%s\": %m\n", *filename);
 
 		/* Start with newline because we might be appending to a file. */
 		fprintf(fp, "\n"

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ parseCommandLine(int argc, char *argv[])`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`if ((log_opts.internal = fopen_priv(INTERNAL_LOG_FILE, "a")) == NULL)`
`220`		`- pg_fatal("could not write to log file \"%s\"\n", INTERNAL_LOG_FILE);`
	`220`	`+ pg_fatal("could not open log file \"%s\": %m\n", INTERNAL_LOG_FILE);`
`221`	`221`
`222`	`222`	`if (log_opts.verbose)`
`223`	`223`	`pg_log(PG_REPORT, "Running in verbose mode\n");`
`@@ -226,7 +226,7 @@ parseCommandLine(int argc, char *argv[])`
`226`	`226`	`for (filename = output_files; *filename != NULL; filename++)`
`227`	`227`	`{`
`228`	`228`	`if ((fp = fopen_priv(*filename, "a")) == NULL)`
`229`		`- pg_fatal("could not write to log file \"%s\"\n", *filename);`
	`229`	`+ pg_fatal("could not write to log file \"%s\": %m\n", *filename);`
`230`	`230`
`231`	`231`	`/* Start with newline because we might be appending to a file. */`
`232`	`232`	`fprintf(fp, "\n"`