Skip to content

Commit 45ca31d

Browse files
committed
Have pg_upgrade only use one extra log file for Win32, not two.
1 parent 31d9658 commit 45ca31d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

contrib/pg_upgrade/pg_upgrade.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ OSInfo os_info;
5858
char *output_files[] = {
5959
SERVER_LOG_FILE,
6060
#ifdef WIN32
61+
/* unique file for pg_ctl start */
6162
SERVER_START_LOG_FILE,
62-
SERVER_STOP_LOG_FILE,
6363
#endif
6464
RESTORE_LOG_FILE,
6565
UTILITY_LOG_FILE,

contrib/pg_upgrade/pg_upgrade.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ extern char *output_files[];
6363
#define SERVER_STOP_LOG_FILE SERVER_LOG_FILE
6464
#else
6565
#define SERVER_START_LOG_FILE "pg_upgrade_server_start.log"
66-
#define SERVER_STOP_LOG_FILE "pg_upgrade_server_stop.log"
66+
/* pg_ctl stop doesn't keep the log file open, so reuse UTILITY_LOG_FILE */
67+
#define SERVER_STOP_LOG_FILE UTILITY_LOG_FILE
6768
#endif
6869

6970

0 commit comments

Comments
 (0)