details: http://hg.nginx.org/nginx/rev/23ecffd5bcfe
branches:
changeset: 6985:23ecffd5bcfe
user: Igor Sysoev <igor@sysoev.ru>
date: Thu Apr 20 13:58:16 2017 +0300
description:
Core: signal sender pid logging.

diffstat:

src/os/unix/ngx_process.c | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r 201038680680 -r 23ecffd5bcfe src/os/unix/ngx_process.c
--- a/src/os/unix/ngx_process.c Tue Apr 18 19:55:23 2017 +0300
+++ b/src/os/unix/ngx_process.c Thu Apr 20 13:58:16 2017 +0300
@@ -15,13 +15,13 @@ typedef struct {
int signo;
char *signame;
char *name;
- void (*handler)(int signo);
+ void (*handler)(int signo, siginfo_t *siginfo, void *ucontext);
} ngx_signal_t;



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_unlock_mutexes(ngx_pid_t pid);

@@ -75,9 +75,9 @@ ngx_signal_t signals[] = {

{ 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 }
};
@@ -288,7 +288,15 @@ ngx_init_signals(ngx_log_t *log)

for (sig = signals; sig->signo != 0; sig++) {
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);
if (sigaction(sig->signo, &sa, NULL) == -1) {
#if (NGX_VALGRIND)
@@ -307,7 +315,7 @@ ngx_init_signals(ngx_log_t *log)


static void
-ngx_signal_handler(int signo)
+ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
{
char *action;
ngx_int_t ignore;
@@ -431,8 +439,16 @@ ngx_signal_handler(int signo)
break;
}

- ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
- "signal %d (%s) received%s", signo, sig->signame, action);
+ if (siginfo && siginfo->si_pid) {
+ 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) {
ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, 0,
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel