diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-10-17 15:59:51 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-10-17 16:03:12 +0100 |
| commit | 96ed946b2b0301489419d1b0321f9a94e35b3abc (patch) | |
| tree | 1f946f5725528ee345569a02d7e6964195155388 | |
| parent | bd6bce888a426b2d8af44f7145e5107cdedb8841 (diff) | |
| download | php-git-96ed946b2b0301489419d1b0321f9a94e35b3abc.tar.gz | |
Merge branch 'pull-request/2097'
| -rw-r--r-- | sapi/fpm/fpm/fpm_request.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index ec8601b478..3f82a7d4f7 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -262,8 +262,9 @@ void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, fpm_trace_signal(child->pid); - zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' (request: \"%s %s\") executing too slow (%d.%06d sec), logging", + zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' (request: \"%s %s%s%s\") executing too slow (%d.%06d sec), logging", child->wp->config->name, (int) child->pid, purified_script_filename, proc.request_method, proc.request_uri, + (proc.query_string[0] ? "?" : ""), proc.query_string, (int) tv.tv_sec, (int) tv.tv_usec); } else @@ -272,8 +273,9 @@ void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, str_purify_filename(purified_script_filename, proc.script_filename, sizeof(proc.script_filename)); fpm_pctl_kill(child->pid, FPM_PCTL_TERM); - zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' (request: \"%s %s\") execution timed out (%d.%06d sec), terminating", + zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' (request: \"%s %s%s%s\") execution timed out (%d.%06d sec), terminating", child->wp->config->name, (int) child->pid, purified_script_filename, proc.request_method, proc.request_uri, + (proc.query_string[0] ? "?" : ""), proc.query_string, (int) tv.tv_sec, (int) tv.tv_usec); } } |