From 7402180a1a32a3cf309c96dc6b87a4dcec6f718c Mon Sep 17 00:00:00 2001 From: Roman Dzhabarov Date: Thu, 22 Sep 2016 11:08:54 -0700 Subject: [PATCH 1/2] Clarify new line separator in access log. --- docs/configuration/http_conn_man/access_log.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/configuration/http_conn_man/access_log.rst b/docs/configuration/http_conn_man/access_log.rst index 14eff7141963..72840c8a77c5 100644 --- a/docs/configuration/http_conn_man/access_log.rst +++ b/docs/configuration/http_conn_man/access_log.rst @@ -45,8 +45,11 @@ Format rules ------------ The access log format string contains either command operators or other characters interpreted as a -plain string. Note, if one of the parameters are not available '-' will be present in the log -entry. The following command operators are supported: +plain string. Access log formatter does not do assumptions on a new line separator, so you +have to specify it explicitly as part of format string, +see :ref:`default format `, for example. +Note, access log line contains '-' character for every not set/empty value. +The following command operators are supported: %START_TIME% Request start time including milliseconds. @@ -104,7 +107,7 @@ If custom format is not specified, Envoy uses the following default format: [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%" %RESPONSE_CODE% %FAILURE_REASON% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" - "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" + "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"\n Example of the default Envoy access log format: From a5997f777e2fddaad5f67fa962bc92942e60951d Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 22 Sep 2016 11:25:25 -0700 Subject: [PATCH 2/2] Update access_log.rst --- docs/configuration/http_conn_man/access_log.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/configuration/http_conn_man/access_log.rst b/docs/configuration/http_conn_man/access_log.rst index 72840c8a77c5..6c53f27fd53a 100644 --- a/docs/configuration/http_conn_man/access_log.rst +++ b/docs/configuration/http_conn_man/access_log.rst @@ -45,10 +45,11 @@ Format rules ------------ The access log format string contains either command operators or other characters interpreted as a -plain string. Access log formatter does not do assumptions on a new line separator, so you -have to specify it explicitly as part of format string, -see :ref:`default format `, for example. -Note, access log line contains '-' character for every not set/empty value. +plain string. The access log formatter does not make any assumptions about a new line separator, so one +has to specified as part of the format string. +See the :ref:`default format ` for an example. +Note that the access log line will contain a '-' character for every not set/empty value. + The following command operators are supported: %START_TIME%