]> git.ipfire.org Git - thirdparty/squid.git/commit - src/main.cc
Log Format token namespace upgrade
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 18 Nov 2011 07:48:25 +0000 (00:48 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 18 Nov 2011 07:48:25 +0000 (00:48 -0700)
commit31971e6abe3251b7bb42b7196fdafc82f9c04b7a
treed03cee3a9b8c900e76c0d1248ea6f13a15cf1b6f
parentf622c4610dff528c3d3d3b1507757b64956afc7f
Log Format token namespace upgrade

This updates the format parser and storage objects in the Format::
namespace and separates some into separate files.

Add a registration API so components can register themselves an array
of tokens in a namespace. Registering the arbitrary namespace "example"
with some tokens ("a","b") will cause the parser to accept those tokens
in a logging format like so: "%example::a %example::b".

Future work:
 - use runners registry instead of Init() function
 - convert the error pages to use format for the page body macros
 - convert the %ssl_* tokens in src/ssl/* to use format and "ssl::"
 - convert external_acl_type to use formats for its helper input string.
19 files changed:
src/client_db.cc
src/client_side_reply.cc
src/client_side_request.cc
src/format/ByteCode.h [moved from src/format/Tokens.h with 69% similarity]
src/format/Config.cc [new file with mode: 0644]
src/format/Config.h [new file with mode: 0644]
src/format/Format.cc
src/format/Makefile.am
src/format/Token.cc [moved from src/format/Tokens.cc with 84% similarity]
src/format/Token.h [new file with mode: 0644]
src/format/TokenTableEntry.h [new file with mode: 0644]
src/log/FormatHttpdCombined.cc
src/log/FormatHttpdCommon.cc
src/log/FormatSquidCustom.cc
src/log/FormatSquidNative.cc
src/log/access_log.cc
src/main.cc
src/stat.cc
src/store_log.cc