Merge pull request #756 from berkerpeksag/fix-markup-log-format-doc

Fix markup of the access_log_format documentation.
This commit is contained in:
Randall Leeds 2014-05-17 16:44:30 -07:00
commit b492ee92e1
2 changed files with 40 additions and 41 deletions

View File

@ -421,28 +421,27 @@ access_log_format
* ``--access-logformat STRING`` * ``--access-logformat STRING``
* ``%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"`` * ``%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"``
The Access log format . The access log format.
By default: ========== ===========
Identifier Description
%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s" ========== ===========
h remote address
l '-'
| h: remote address u currently '-', may be user name in future releases
| l: '-' t date of the request
| u: currently '-', may be user name in future releases r status line (e.g. ``GET / HTTP/1.1``)
| t: date of the request s status
| r: status line (ex: GET / HTTP/1.1) b response length or '-'
| s: status f referer
| b: response length or '-' a user agent
| f: referer T request time in seconds
| a: user agent D request time in microseconds
| T: request time in seconds L request time in decimal seconds
| D: request time in microseconds p process ID
| L: request time in decimal seconds {Header}i request header
| p: process ID {Header}o response header
| {Header}i: request header ========== ===========
| {Header}o: response header
errorlog errorlog
~~~~~~~~ ~~~~~~~~

View File

@ -962,27 +962,27 @@ class AccessLogFormat(Setting):
validator = validate_string validator = validate_string
default = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"' default = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'
desc = """\ desc = """\
The Access log format . The access log format.
By default: ========== ===========
Identifier Description
%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s" ========== ===========
h remote address
l '-'
| h: remote address u currently '-', may be user name in future releases
| l: '-' t date of the request
| u: currently '-', may be user name in future releases r status line (e.g. ``GET / HTTP/1.1``)
| t: date of the request s status
| r: status line (ex: GET / HTTP/1.1) b response length or '-'
| s: status f referer
| b: response length or '-' a user agent
| f: referer T request time in seconds
| a: user agent D request time in microseconds
| T: request time in seconds L request time in decimal seconds
| D: request time in microseconds, p process ID
| p: process ID {Header}i request header
| {Header}i: request header {Header}o response header
| {Header}o: response header ========== ===========
""" """