database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Use sys_siglist[] to print out signal names for signal exits, rather

Browse Source 
than just numbers.
This commit is contained in:
Bruce Momjian
2007-01-28 01:12:05 +00:00
parent 3ec7ae1b67
commit 82480fc254
5 changed files with 104 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.512 2007/01/23 03:28:49 momjian Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.513 2007/01/28 01:12:05 momjian Exp $
*
* NOTES
*
@ -2421,15 +2421,7 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
(errmsg("%s (PID %d) exited with exit code %d",
procname, pid, WEXITSTATUS(exitstatus))));
else if (WIFSIGNALED(exitstatus))
#ifndef WIN32
ereport(lev,
/*------
translator: %s is a noun phrase describing a child process, such as
"server process" */
(errmsg("%s (PID %d) was terminated by signal %d",
procname, pid, WTERMSIG(exitstatus))));
#else
#if defined(WIN32)
ereport(lev,
/*------
@ -2437,7 +2429,25 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
"server process" */
(errmsg("%s (PID %d) was terminated by exception %X",
procname, pid, WTERMSIG(exitstatus)),
errhint("See /include/ntstatus.h for a description of the hex value.")));
errhint("See C include file \"ntstatus.h\" for a description of the hex value.")));
#elif defined(HAVE_SYS_SIGLIST)
ereport(lev,
/*------
translator: %s is a noun phrase describing a child process, such as
"server process" */
(errmsg("%s (PID %d) was terminated by signal: %s (%d)",
procname, pid, WTERMSIG(exitstatus) < NSIG ?
sys_siglist[WTERMSIG(exitstatus)] : "unknown signal",
WTERMSIG(exitstatus))));
#else
ereport(lev,
/*------
translator: %s is a noun phrase describing a child process, such as
"server process" */
(errmsg("%s (PID %d) was terminated by signal %d",
procname, pid, WTERMSIG(exitstatus))));
#endif
else
ereport(lev,

3
src/include/pg_config.h.in
View File

@ -478,6 +478,9 @@
/* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H
/* Define to 1 if you have the global variable 'char *sys_siglist[]'. */
#undef HAVE_SYS_SIGLIST
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H

12
src/port/exec.c
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/port/exec.c,v 1.48 2007/01/23 03:31:33 momjian Exp $
* $PostgreSQL: pgsql/src/port/exec.c,v 1.49 2007/01/28 01:12:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -582,11 +582,15 @@ pclose_check(FILE *stream)
log_error(_("child process exited with exit code %d"),
WEXITSTATUS(exitstatus));
else if (WIFSIGNALED(exitstatus))
#ifndef WIN32
log_error(_("child process was terminated by signal %d"),
#if defined(WIN32)
log_error(_("child process was terminated by exception %X\nSee C include file \"ntstatus.h\" for a description of the hex value."),
WTERMSIG(exitstatus));
#elif defined(HAVE_SYS_SIGLIST)
log_error(_("child process was terminated by signal: %s"),
WTERMSIG(exitstatus) < NSIG ?
sys_siglist[WTERMSIG(exitstatus)] : "unknown signal");
#else
log_error(_("child process was terminated by exception %X\nSee /include/ntstatus.h for a description of the hex value."),
log_error(_("child process was terminated by signal %d"),
WTERMSIG(exitstatus));
#endif
else