Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix definitions of combined/common log formats #1821

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions config/goaccess.conf
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@
# NOTE: If the time/date is a timestamp in seconds or microseconds
# %x must be used instead of %d & %t to represent the date & time.

# NCSA Combined Log Format
#log-format %h %^[%d:%t %^] "%r" %s %b "%R" "%u"
# Apache/NCSA Combined Log Format
#log-format %h %^ %^ [%d:%t %^] "%r" %s %b "%R" "%u"

# NCSA Combined Log Format with Virtual Host
#log-format %v:%^ %h %^[%d:%t %^] "%r" %s %b "%R" "%u"
# Apache/NCSA Combined Log Format with Virtual Host
#log-format %v:%^ %h %^ %^ [%d:%t %^] "%r" %s %b "%R" "%u"

# Common Log Format (CLF)
#log-format %h %^[%d:%t %^] "%r" %s %b
# Apache/NCSA Common Log Format (CLF)
#log-format %h %^ %^ [%d:%t %^] "%r" %s %b

# Common Log Format (CLF) with Virtual Host
#log-format %v:%^ %h %^[%d:%t %^] "%r" %s %b
# Apache/NCSA Common Log Format (CLF) with Virtual Host
#log-format %v:%^ %h %^ %^ [%d:%t %^] "%r" %s %b

# W3C
#log-format %d %t %h %^ %^ %^ %^ %r %^ %s %b %^ %^ %u %R
Expand Down
8 changes: 4 additions & 4 deletions src/settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ static GEnum LOGTYPE[] = {
};

static const GPreConfLog logs = {
"%h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\"", /* NCSA */
"%v:%^ %h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\"", /* NCSA + VHost */
"%h %^[%d:%t %^] \"%r\" %s %b", /* CLF */
"%v:%^ %h %^[%d:%t %^] \"%r\" %s %b", /* CLF+VHost */
"%h %^ %^ [%d:%t %^] \"%r\" %s %b \"%R\" \"%u\"", /* Apache/NCSA Combined Log Format */
"%v:%^ %h %^ %^ [%d:%t %^] \"%r\" %s %b \"%R\" \"%u\"", /* Apache/NCSA Combined Log Format + VHost */
"%h %^ %^ [%d:%t %^] \"%r\" %s %b", /* Apache/NCSA Common Log Format */
"%v:%^ %h %^ %^ [%d:%t %^] \"%r\" %s %b", /* Apache/NCSA Common Log Format + VHost */
"%d %t %^ %m %U %q %^ %^ %h %u %R %s %^ %^ %L", /* W3C */
"%d\\t%t\\t%^\\t%b\\t%h\\t%m\\t%^\\t%r\\t%s\\t%R\\t%u\\t%^", /* CloudFront */
"\"%x\",\"%h\",%^,%^,\"%m\",\"%U\",\"%s\",%^,\"%b\",\"%D\",%^,\"%R\",\"%u\"", /* Cloud Storage */
Expand Down