mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 14:56:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: signal sender pid logging.

Browse Source
This commit is contained in:
Igor Sysoev 2017-04-20 13:58:16 +03:00
parent cb7427d86c
commit 30e26a8c57
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/os/unix/ngx_process.c
View File

@ -15,13 +15,13 @@ typedef struct {
int signo; int signo;
char *signame; char *signame;
char *name; char *name;
void (*handler)(int signo); void (*handler)(int signo, siginfo_t *siginfo, void *ucontext);
} ngx_signal_t; } ngx_signal_t;
static void ngx_execute_proc(ngx_cycle_t *cycle, void *data); static void ngx_execute_proc(ngx_cycle_t *cycle, void *data);
static void ngx_signal_handler(int signo); static void ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext);
static void ngx_process_get_status(void); static void ngx_process_get_status(void);
static void ngx_unlock_mutexes(ngx_pid_t pid); static void ngx_unlock_mutexes(ngx_pid_t pid);
@ -75,9 +75,9 @@ ngx_signal_t signals[] = {
{ SIGCHLD, "SIGCHLD", "", ngx_signal_handler }, { SIGCHLD, "SIGCHLD", "", ngx_signal_handler },
{ SIGSYS, "SIGSYS, SIG_IGN", "", SIG_IGN }, { SIGSYS, "SIGSYS, SIG_IGN", "", NULL },
{ SIGPIPE, "SIGPIPE, SIG_IGN", "", SIG_IGN }, { SIGPIPE, "SIGPIPE, SIG_IGN", "", NULL },
{ 0, NULL, "", NULL } { 0, NULL, "", NULL }
}; };
@ -288,7 +288,15 @@ ngx_init_signals(ngx_log_t *log)
for (sig = signals; sig->signo != 0; sig++) { for (sig = signals; sig->signo != 0; sig++) {
ngx_memzero(&sa, sizeof(struct sigaction)); ngx_memzero(&sa, sizeof(struct sigaction));
sa.sa_handler = sig->handler;
if (sig->handler) {
sa.sa_sigaction = sig->handler;
sa.sa_flags = SA_SIGINFO;
} else {
sa.sa_handler = SIG_IGN;
}
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
if (sigaction(sig->signo, &sa, NULL) == -1) { if (sigaction(sig->signo, &sa, NULL) == -1) {
#if (NGX_VALGRIND) #if (NGX_VALGRIND)
@ -307,7 +315,7 @@ ngx_init_signals(ngx_log_t *log)
static void static void
ngx_signal_handler(int signo) ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
{ {
char *action; char *action;
ngx_int_t ignore; ngx_int_t ignore;
@ -431,8 +439,16 @@ ngx_signal_handler(int signo)
break; break;
} }
ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, if (siginfo && siginfo->si_pid) {
"signal %d (%s) received%s", signo, sig->signame, action); ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
"signal %d (%s) received from %P%s",
signo, sig->signame, siginfo->si_pid, action);
} else {
ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
"signal %d (%s) received%s",
signo, sig->signame, action);
}
if (ignore) { if (ignore) {
ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, 0, ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, 0,