diff options
| -rw-r--r-- | src/bin/pg_basebackup/pg_receivewal.c | 12 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/pg_recvlogical.c | 22 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c index ed9d7f6378a..ac04dcd9445 100644 --- a/src/bin/pg_basebackup/pg_receivewal.c +++ b/src/bin/pg_basebackup/pg_receivewal.c @@ -684,10 +684,6 @@ main(int argc, char **argv) close_destination_dir(dir, basedir); } -#ifndef WIN32 - pqsignal(SIGINT, sigint_handler); -#endif - /* * Obtain a connection before doing anything. */ @@ -697,6 +693,14 @@ main(int argc, char **argv) exit(1); /* + * Trap signals. (Don't do this until after the initial password prompt, + * if one is needed, in GetConnection.) + */ +#ifndef WIN32 + pqsignal(SIGINT, sigint_handler); +#endif + + /* * Run IDENTIFY_SYSTEM to make sure we've successfully have established a * replication connection and haven't connected using a database specific * connection. diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c index f2fe4c55b2f..1f93907157d 100644 --- a/src/bin/pg_basebackup/pg_recvlogical.c +++ b/src/bin/pg_basebackup/pg_recvlogical.c @@ -220,8 +220,6 @@ StreamLogicalLog(void) output_written_lsn = InvalidXLogRecPtr; output_fsync_lsn = InvalidXLogRecPtr; - query = createPQExpBuffer(); - /* * Connect in replication mode to the server */ @@ -241,6 +239,7 @@ StreamLogicalLog(void) replication_slot); /* Initiate the replication stream at specified location */ + query = createPQExpBuffer(); appendPQExpBuffer(query, "START_REPLICATION SLOT \"%s\" LOGICAL %X/%X", replication_slot, (uint32) (startpos >> 32), (uint32) startpos); @@ -956,15 +955,9 @@ main(int argc, char **argv) exit(1); } -#ifndef WIN32 - pqsignal(SIGINT, sigint_handler); - pqsignal(SIGHUP, sighup_handler); -#endif - /* - * Obtain a connection to server. This is not really necessary but it - * helps to get more precise error messages about authentication, required - * GUC parameters and such. + * Obtain a connection to server. Notably, if we need a password, we want + * to collect it from the user immediately. */ conn = GetConnection(); if (!conn) @@ -972,6 +965,15 @@ main(int argc, char **argv) exit(1); /* + * Trap signals. (Don't do this until after the initial password prompt, + * if one is needed, in GetConnection.) + */ +#ifndef WIN32 + pqsignal(SIGINT, sigint_handler); + pqsignal(SIGHUP, sighup_handler); +#endif + + /* * Run IDENTIFY_SYSTEM to make sure we connected using a database specific * replication connection. */ |