Commit 34faec2c authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

Support log parameters used in apache_frontend

parent e87930be
...@@ -768,6 +768,7 @@ server_name_group_dict = { ...@@ -768,6 +768,7 @@ server_name_group_dict = {
logformat_dict = { logformat_dict = {
'%h': r'(?P<host>[^ ]*)', '%h': r'(?P<host>[^ ]*)',
'%b': r'(?P<bytes>[0-9-]*?)',
'%l': r'(?P<ident>[^ ]*)', '%l': r'(?P<ident>[^ ]*)',
'%u': r'(?P<user>[^ ]*)', '%u': r'(?P<user>[^ ]*)',
'%t': r'\[(?P<timestamp>[^\]]*)\]', '%t': r'\[(?P<timestamp>[^\]]*)\]',
...@@ -775,6 +776,7 @@ logformat_dict = { ...@@ -775,6 +776,7 @@ logformat_dict = {
'%>s': r'(?P<status>[0-9]*?)', '%>s': r'(?P<status>[0-9]*?)',
'%O': r'(?P<size>[0-9-]*?)', '%O': r'(?P<size>[0-9-]*?)',
'%{Referer}i': r'(?P<referer>[^"]*)', # XXX: expected to be enclosed in " '%{Referer}i': r'(?P<referer>[^"]*)', # XXX: expected to be enclosed in "
'%{REMOTE_USER}i': r'(?P<remote_user>[^"]*)', # XXX: expected to be enclosed in "
'%{User-Agent}i': r'(?P<agent>[^"]*)', # XXX: expected to be enclosed in " '%{User-Agent}i': r'(?P<agent>[^"]*)', # XXX: expected to be enclosed in "
DURATION_US_FORMAT: r'(?P<duration>[0-9]*)', DURATION_US_FORMAT: r'(?P<duration>[0-9]*)',
DURATION_S_FORMAT: r'(?P<duration_s>[0-9]*)', DURATION_S_FORMAT: r'(?P<duration_s>[0-9]*)',
...@@ -789,6 +791,7 @@ expensive_logformat_dict = { ...@@ -789,6 +791,7 @@ expensive_logformat_dict = {
'%r': r'(?P<request>(\\.|[^\\"])*)', '%r': r'(?P<request>(\\.|[^\\"])*)',
'%{Referer}i': r'(?P<referer>(\\.|[^\\"])*)', '%{Referer}i': r'(?P<referer>(\\.|[^\\"])*)',
'%{User-Agent}i': r'(?P<agent>(\\.|[^\\"])*)', '%{User-Agent}i': r'(?P<agent>(\\.|[^\\"])*)',
'%{REMOTE_USER}i': r'(?P<remote_user>(\\.|[^\\"])*)',
} }
REQUEST_PATTERN = re.compile('(?P<method>[^ ]*) (?P<url>[^ ]*)' REQUEST_PATTERN = re.compile('(?P<method>[^ ]*) (?P<url>[^ ]*)'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment