From 39dbe983c38c8d2fd6182c4955f11ceb3f333342 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Sun, 18 May 2014 02:01:42 +0300 Subject: [PATCH] Fix markup of the access_log_format documentation. --- docs/source/settings.rst | 41 ++++++++++++++++++++-------------------- gunicorn/config.py | 40 +++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/docs/source/settings.rst b/docs/source/settings.rst index 2f8edaeb..38a9b0d1 100644 --- a/docs/source/settings.rst +++ b/docs/source/settings.rst @@ -421,28 +421,27 @@ access_log_format * ``--access-logformat STRING`` * ``%(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: - -%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s" - - -| h: remote address -| l: '-' -| u: currently '-', may be user name in future releases -| t: date of the request -| r: status line (ex: GET / HTTP/1.1) -| s: status -| b: response length or '-' -| f: referer -| a: user agent -| T: request time in seconds -| D: request time in microseconds -| L: request time in decimal seconds -| p: process ID -| {Header}i: request header -| {Header}o: response header +========== =========== +Identifier Description +========== =========== +h remote address +l '-' +u currently '-', may be user name in future releases +t date of the request +r status line (e.g. ``GET / HTTP/1.1``) +s status +b response length or '-' +f referer +a user agent +T request time in seconds +D request time in microseconds +L request time in decimal seconds +p process ID +{Header}i request header +{Header}o response header +========== =========== errorlog ~~~~~~~~ diff --git a/gunicorn/config.py b/gunicorn/config.py index 6cadd09b..ab0040bd 100644 --- a/gunicorn/config.py +++ b/gunicorn/config.py @@ -962,27 +962,27 @@ class AccessLogFormat(Setting): validator = validate_string default = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"' desc = """\ - The Access log format . + The access log format. - By default: - - %(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s" - - - | h: remote address - | l: '-' - | u: currently '-', may be user name in future releases - | t: date of the request - | r: status line (ex: GET / HTTP/1.1) - | s: status - | b: response length or '-' - | f: referer - | a: user agent - | T: request time in seconds - | D: request time in microseconds, - | p: process ID - | {Header}i: request header - | {Header}o: response header + ========== =========== + Identifier Description + ========== =========== + h remote address + l '-' + u currently '-', may be user name in future releases + t date of the request + r status line (e.g. ``GET / HTTP/1.1``) + s status + b response length or '-' + f referer + a user agent + T request time in seconds + D request time in microseconds + L request time in decimal seconds + p process ID + {Header}i request header + {Header}o response header + ========== =========== """