Commit 5b4fa959 authored by Bruce Momjian's avatar Bruce Momjian

Update process termination message to display signal number and name

from exec.c and postmaster.c.
parent 48ba3f57
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.515 2007/01/28 06:32:03 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.516 2007/01/29 20:17:40 momjian Exp $
* *
* NOTES * NOTES
* *
...@@ -2436,11 +2436,10 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus) ...@@ -2436,11 +2436,10 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
/*------ /*------
translator: %s is a noun phrase describing a child process, such as translator: %s is a noun phrase describing a child process, such as
"server process" */ "server process" */
(errmsg("%s (PID %d) was terminated by signal %s (%d)", (errmsg("%s (PID %d) was terminated by signal %d: %s",
procname, pid, procname, pid, WTERMSIG(exitstatus),
WTERMSIG(exitstatus) < NSIG ? WTERMSIG(exitstatus) < NSIG ?
sys_siglist[WTERMSIG(exitstatus)] : "(unknown)", sys_siglist[WTERMSIG(exitstatus)] : "(unknown)")));
WTERMSIG(exitstatus))));
#else #else
ereport(lev, ereport(lev,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/exec.c,v 1.53 2007/01/28 07:29:32 tgl Exp $ * $PostgreSQL: pgsql/src/port/exec.c,v 1.54 2007/01/29 20:17:40 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -587,9 +587,14 @@ pclose_check(FILE *stream) ...@@ -587,9 +587,14 @@ pclose_check(FILE *stream)
log_error(_("child process was terminated by exception 0x%X"), log_error(_("child process was terminated by exception 0x%X"),
WTERMSIG(exitstatus)); WTERMSIG(exitstatus));
#elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST #elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST
log_error(_("child process was terminated by signal %s"), {
char str[256];
snprintf(str, 256, "%d: %s", WTERMSIG(exitstatus),
WTERMSIG(exitstatus) < NSIG ? WTERMSIG(exitstatus) < NSIG ?
sys_siglist[WTERMSIG(exitstatus)] : "(unknown)"); sys_siglist[WTERMSIG(exitstatus)] : "(unknown)");
log_error(_("child process was terminated by signal %s"), str);
}
#else #else
log_error(_("child process was terminated by signal %d"), log_error(_("child process was terminated by signal %d"),
WTERMSIG(exitstatus)); WTERMSIG(exitstatus));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment