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.
This commit is contained in:
parent
31c453165b
commit
0139dea8f1
@ -504,43 +504,14 @@ BootstrapModeMain(void)
|
|||||||
static void
|
static void
|
||||||
bootstrap_signals(void)
|
bootstrap_signals(void)
|
||||||
{
|
{
|
||||||
if (IsUnderPostmaster)
|
Assert(!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);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Unblock signals (they were blocked when the postmaster forked us)
|
|
||||||
*/
|
|
||||||
PG_SETMASK(&UnBlockSig);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* Set up appropriately for interactive use */
|
/* Set up appropriately for interactive use */
|
||||||
pqsignal(SIGHUP, die);
|
pqsignal(SIGHUP, die);
|
||||||
pqsignal(SIGINT, die);
|
pqsignal(SIGINT, die);
|
||||||
pqsignal(SIGTERM, die);
|
pqsignal(SIGTERM, die);
|
||||||
pqsignal(SIGQUIT, die);
|
pqsignal(SIGQUIT, die);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Begin shutdown of an auxiliary process. This is approximately the equivalent
|
* Begin shutdown of an auxiliary process. This is approximately the equivalent
|
||||||
|
Loading…
x
Reference in New Issue
Block a user