Commit022cd22

committed

In pg_upgrade, document why we can't issue \n\n in the command logfile

on Windows. Slightly cleanup log output on Windows given thisrestriction.Backpatch to 9.2.

1 parentc4c2274 commit022cd22Copy full SHA for 022cd22

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,11 @@ exec_prog(const char log_file, const char opt_log_file,`
`63`	`63`	`if (written >=MAXCMDLEN)`
`64`	`64`	`pg_log(PG_FATAL,"command too long\n");`
`65`	`65`
`66`		`-if ((log=fopen_priv(log_file,"a+"))==NULL)`
	`66`	`+if ((log=fopen_priv(log_file,"a"))==NULL)`
`67`	`67`	`pg_log(PG_FATAL,"cannot write to log file %s\n",log_file);`
	`68`	`+#ifdefWIN32`
	`69`	`+fprintf(log,"\n\n");`
	`70`	`+#endif`
`68`	`71`	`pg_log(PG_VERBOSE,"%s\n",cmd);`
`69`	`72`	`fprintf(log,"command: %s\n",cmd);`
`70`	`73`
`@@ -97,10 +100,13 @@ exec_prog(const char log_file, const char opt_log_file,`
`97`	`100`
`98`	`101`	`#ifndefWIN32`
`99`	`102`	`/*`
`100`		`- * Can't do this on Windows, postmaster will still hold the log file`
`101`		`- * open if the command was "pg_ctl start".`
	`103`	`+ *We can't do this on Windows because it will keep the "pg_ctl start"`
	`104`	`+ *output filename open until the server stops, so we do the \n\n above`
	`105`	`+ *on that platform. We use a unique filename for "pg_ctl start" that is`
	`106`	`+ *never reused while the server is running, so it works fine. We could`
	`107`	`+ *log these commands to a third file, but that just adds complexity.`
`102`	`108`	`*/`
`103`		`-if ((log=fopen_priv(log_file,"a+"))==NULL)`
	`109`	`+if ((log=fopen_priv(log_file,"a"))==NULL)`
`104`	`110`	`pg_log(PG_FATAL,"cannot write to log file %s\n",log_file);`
`105`	`111`	`fprintf(log,"\n\n");`
`106`	`112`	`fclose(log);`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,11 @@ extern char *output_files[];`
`63`	`63`	`#defineSERVER_STOP_LOG_FILESERVER_LOG_FILE`
`64`	`64`	`#else`
`65`	`65`	`#defineSERVER_START_LOG_FILE"pg_upgrade_server_start.log"`
`66`		`-/* pg_ctl stop doesn't keep the log file open, so reuse UTILITY_LOG_FILE */`
	`66`	`+/*`
	`67`	`+ *"pg_ctl start" keeps SERVER_START_LOG_FILE and SERVER_LOG_FILE open`
	`68`	`+ *while the server is running, so we use UTILITY_LOG_FILE for "pg_ctl`
	`69`	`+ *stop".`
	`70`	`+ */`
`67`	`71`	`#defineSERVER_STOP_LOG_FILEUTILITY_LOG_FILE`
`68`	`72`	`#endif`
`69`	`73`

Comments

(0)