Remove some dead IsUnderPostmaster code from bootstrap.c.

Since commit 626eb021988a2 has introduced the auxiliary process
infrastructure, bootstrap_signals() was never used when forked from
postmaster.

Remove the IsUnderPostmaster specific code, and add a appropriate
assertion.

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 57a1c99d61cf6031122fc49d7e3d6846152ba1b1..0819e804becf77d221c9bd35f642723be055efa0 100644 (file)
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -504,42 +504,13 @@ BootstrapModeMain(void)
 static void
 bootstrap_signals(void)
 {
-       if (IsUnderPostmaster)
-       {
-               /*
-                * Properly accept or ignore signals the postmaster might send us
-                */
-               pqsignal(SIGHUP, SIG_IGN);
-               pqsignal(SIGINT, SIG_IGN);              /* ignore query-cancel */
-               pqsignal(SIGTERM, die);
-               pqsignal(SIGQUIT, quickdie);
-               pqsignal(SIGALRM, SIG_IGN);
-               pqsignal(SIGPIPE, SIG_IGN);
-               pqsignal(SIGUSR1, SIG_IGN);
-               pqsignal(SIGUSR2, SIG_IGN);
-
-               /*
-                * Reset some signals that are accepted by postmaster but not here
-                */
-               pqsignal(SIGCHLD, SIG_DFL);
-               pqsignal(SIGTTIN, SIG_DFL);
-               pqsignal(SIGTTOU, SIG_DFL);
-               pqsignal(SIGCONT, SIG_DFL);
-               pqsignal(SIGWINCH, SIG_DFL);
+       Assert(!IsUnderPostmaster);
 
-               /*
-                * Unblock signals (they were blocked when the postmaster forked us)
-                */
-               PG_SETMASK(&UnBlockSig);
-       }
-       else
-       {
-               /* Set up appropriately for interactive use */
-               pqsignal(SIGHUP, die);
-               pqsignal(SIGINT, die);
-               pqsignal(SIGTERM, die);
-               pqsignal(SIGQUIT, die);
-       }
+       /* Set up appropriately for interactive use */
+       pqsignal(SIGHUP, die);
+       pqsignal(SIGINT, die);
+       pqsignal(SIGTERM, die);
+       pqsignal(SIGQUIT, die);
 }
 
 /*