From 4f3bde886834ea0809a6beb17cc784cfa26b2f98 Mon Sep 17 00:00:00 2001 From: Mikhail Alferov Date: Mon, 23 Sep 2024 19:55:38 +0300 Subject: [PATCH 1/6] configuration.xml Clarify the option descriptoins Maybe we should explain the access log format in more detail? --- install/fpm/configuration.xml | 82 ++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index a9c144c54aeb..958e419c5747 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -803,117 +803,157 @@ + + + %% + + The % character + %C - %CPU + + %CPU used by the request. It can accept the following format: + %{user}C for user CPU only, + %{system}C for system CPU only, + %{total}C for user + system CPU (default) + %d - duration. accepts following formats for precision: + Time taken to serve the request. It can accept the following formats for precision: %{seconds}d (default), %{milliseconds}d, - %{microseconds}d. + %{microseconds}d %e - fastcgi env + + An environment variable (same as $_ENV or $_SERVER). + It must be associated with embraces to specify the name of the env + variable. Some examples: server specifics like: %{REQUEST_METHOD}e or + %{SERVER_PROTOCOL}e, HTTP headers like: + %{HTTP_HOST}e or %{HTTP_USER_AGENT}e + %f - script + Script filename %l - content length + + Content-Length of the request (for HTTP POST request only) + %m - method + Request HTTP method %M - memory + + Peak of memory allocated by PHP. It can accept the following format: + %{bytes}M (default), %{kilobytes}M + %{kilo}M, %{megabytes}M, + %{mega}M + %n - pool name + Pool name %o - header output + + Output header. It must be associated with embraces to + specify the name of the header: %{Content-Type}o, + %{X-Powered-By}o, %{Transfert-Encoding}o + %p - PID + PID of the child that serviced the request + + + + %P + + PID of the parent of the child that serviced the request %q - query string + The query string %Q - the glue between %q and %r + + The '?' character, or glue between %q and %r, + if query string exists + %r - request URI + + The request URI (without the query string, + see %q and %Q) + %R - remote IP address + Temote IP address %s - status + Status (response code) - %T + %t - time + Server time the request was received - %t + %T - time + Time the log has been written (the request has finished) %u - remote user + Remote user From 383f87204e46ef803b6529c4a24c90283d1aef61 Mon Sep 17 00:00:00 2001 From: Mikhail Alferov Date: Tue, 24 Sep 2024 01:55:00 +0300 Subject: [PATCH 2/6] Update install/fpm/configuration.xml Co-authored-by: Jim Winstead --- install/fpm/configuration.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index 958e419c5747..8a7bda2508bb 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -835,9 +835,9 @@ %e - An environment variable (same as $_ENV or $_SERVER). - It must be associated with embraces to specify the name of the env - variable. Some examples: server specifics like: %{REQUEST_METHOD}e or + A variable from the server environment (same as $_ENV or $_SERVER). + A variable name must be specified within curly brackets. + For example: server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e, HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e From 8d4661b294617c669200a33ac65715ec674612c3 Mon Sep 17 00:00:00 2001 From: Mikhail Alferov Date: Tue, 24 Sep 2024 01:57:25 +0300 Subject: [PATCH 3/6] Update install/fpm/configuration.xml Add required replaceable name Co-authored-by: Jim Winstead --- install/fpm/configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index 8a7bda2508bb..0e44b3a975f1 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -832,7 +832,7 @@ - %e + %{name}e A variable from the server environment (same as $_ENV or $_SERVER). From ce28690a294b67afe729e5df7cbfbe2743700584 Mon Sep 17 00:00:00 2001 From: Mikhail Alferov Date: Tue, 24 Sep 2024 01:57:57 +0300 Subject: [PATCH 4/6] Update install/fpm/configuration.xml Add required replaceable name Co-authored-by: Jim Winstead --- install/fpm/configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index 0e44b3a975f1..7f0e8194c125 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -881,7 +881,7 @@ - %o + %{name}o Output header. It must be associated with embraces to From 8b9135fd2f12840053869ff1db47faf8265f59dd Mon Sep 17 00:00:00 2001 From: Mikhail Alferov Date: Tue, 24 Sep 2024 01:59:22 +0300 Subject: [PATCH 5/6] Update install/fpm/configuration.xml Amend typo Co-authored-by: Jim Winstead --- install/fpm/configuration.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index 7f0e8194c125..b1e597aa19b9 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -884,9 +884,9 @@ %{name}o - Output header. It must be associated with embraces to - specify the name of the header: %{Content-Type}o, - %{X-Powered-By}o, %{Transfert-Encoding}o + Output header. The header name must be specified within curly brackets. + For example: %{Content-Type}o, + %{X-Powered-By}o, %{Transfer-Encoding}o From 0817cec6d8b188d264b2c9b6d2c95e64b19bf25b Mon Sep 17 00:00:00 2001 From: Mikhail Alferov Date: Tue, 24 Sep 2024 02:00:07 +0300 Subject: [PATCH 6/6] Update configuration.xml Fix typo --- install/fpm/configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index b1e597aa19b9..87ade34cb21a 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -929,7 +929,7 @@ %R - Temote IP address + Remote IP address