From 1062917551121021c6ad9d56273da5e483ea7c29 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 23 Jan 2024 11:19:07 +0200 Subject: [PATCH v4 4/5] Use existing AmWalReceiverProcess() function --- src/backend/replication/walreceiver.c | 9 --------- src/backend/tcop/postgres.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 110d96a4e6..abaf21a20c 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -167,15 +167,6 @@ WalRcvShutdownSignalHandler(SIGNAL_ARGS) } -/* - * Is current process a wal receiver? - */ -bool -IsWalReceiver(void) -{ - return MyBackendType == B_WAL_RECEIVER; -} - /* Main entry point for walreceiver process */ void WalReceiverMain(void) diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 2ce24d8a9a..5a4dc1977d 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -3287,7 +3287,7 @@ ProcessInterrupts(void) */ proc_exit(1); } - else if (IsWalReceiver()) + else if (AmWalReceiverProcess()) ereport(FATAL, (errcode(ERRCODE_ADMIN_SHUTDOWN), errmsg("terminating walreceiver process due to administrator command"))); -- 2.39.3