You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/10/27 22:25:56 UTC
git commit: TS-2265 Remove 3 unused log tags.
Updated Branches:
refs/heads/master 3b1759579 -> 8d461ead9
TS-2265 Remove 3 unused log tags.
These have no meaning or purpose after we cleaned out all the
old streaming protocols etc. This avoids confusion where someone
might think that these 3 tags will do something.
prob
prcb
cgid
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8d461ead
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8d461ead
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8d461ead
Branch: refs/heads/master
Commit: 8d461ead973da66d92daa3c3300e3c19c40d9b7d
Parents: 3b17595
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sun Oct 20 15:26:46 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Oct 27 15:25:36 2013 -0600
----------------------------------------------------------------------
doc/admin/event-logging-formats.en.rst | 13 +++----------
proxy/logging/Log.cc | 21 ---------------------
proxy/logging/LogAccess.cc | 27 ---------------------------
proxy/logging/LogAccess.h | 3 ---
4 files changed, 3 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d461ead/doc/admin/event-logging-formats.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/event-logging-formats.en.rst b/doc/admin/event-logging-formats.en.rst
index c4d1727..e7e3261 100644
--- a/doc/admin/event-logging-formats.en.rst
+++ b/doc/admin/event-logging-formats.en.rst
@@ -189,7 +189,7 @@ The following list describes Traffic Server custom logging fields.
Server.
``cwr``
- The cache write result (``-``, ``FIN``, ``ERR`` and so on)
+ The cache write result (``-``, ``WL_MISS``, ``INTR```, ``ERR`` or ``FIN``)
``cwtr``
The cache write transform result
@@ -199,8 +199,8 @@ The following list describes Traffic Server custom logging fields.
``pfsc``
The proxy finish status code; specifies whether the Traffic Server
- request to the origin server was successfully completed (``FIN``) or
- interrupted (``INTR``).
+ request to the origin server was successfully completed (``FIN``),
+ interrupted (``INTR``) or timed out (``TIMEOUT``).
``phn``
The hostname of the Traffic Server that generated the log entry in
@@ -230,13 +230,6 @@ The following list describes Traffic Server custom logging fields.
The proxy request server name; the name of the server that fulfilled
the request.
-``prcb``
- The number of proxy response bytes to the client from the cache.
-
-``prob``
- The number of proxy response bytes to the client from the origin
- server.
-
``pscl``
The length of the Traffic Server response to the client (in bytes).
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d461ead/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index ce15131..411e67b 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -530,13 +530,6 @@ Log::init_fields()
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cfsc", field);
- field = NEW(new LogField("client_gid", "cgid",
- LogField::STRING,
- &LogAccess::marshal_client_gid,
- &LogAccess::unmarshal_str));
- global_field_list.add(field, false);
- ink_hash_table_insert(field_symbol_hash, "cgid", field);
-
// proxy -> client fields
field = NEW(new LogField("proxy_resp_content_type", "psct",
LogField::STRING,
@@ -648,20 +641,6 @@ Log::init_fields()
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "crc", field);
- field = NEW(new LogField("proxy_resp_origin_bytes", "prob",
- LogField::sINT,
- &LogAccess::marshal_proxy_resp_origin_bytes,
- &LogAccess::unmarshal_int_to_str));
- global_field_list.add(field, false);
- ink_hash_table_insert(field_symbol_hash, "prob", field);
-
- field = NEW(new LogField("proxy_resp_cache_bytes", "prcb",
- LogField::sINT,
- &LogAccess::marshal_proxy_resp_cache_bytes,
- &LogAccess::unmarshal_int_to_str));
- global_field_list.add(field, false);
- ink_hash_table_insert(field_symbol_hash, "prcb", field);
-
// proxy -> server fields
field = NEW(new LogField("proxy_req_header_len", "pqhl",
LogField::sINT,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d461ead/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index 7cecced..c6f6eda 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -217,15 +217,6 @@ LogAccess::marshal_client_finish_status_code(char *buf)
-------------------------------------------------------------------------*/
int
-LogAccess::marshal_client_gid(char *buf)
-{
- DEFAULT_STR_FIELD;
-}
-
-/*-------------------------------------------------------------------------
- -------------------------------------------------------------------------*/
-
-int
LogAccess::marshal_client_accelerator_id(char *buf)
{
DEFAULT_STR_FIELD;
@@ -280,24 +271,6 @@ LogAccess::marshal_proxy_resp_header_len(char *buf)
-------------------------------------------------------------------------*/
int
-LogAccess::marshal_proxy_resp_origin_bytes(char *buf)
-{
- DEFAULT_INT_FIELD;
-}
-
-/*-------------------------------------------------------------------------
- -------------------------------------------------------------------------*/
-
-int
-LogAccess::marshal_proxy_resp_cache_bytes(char *buf)
-{
- DEFAULT_INT_FIELD;
-}
-
-/*-------------------------------------------------------------------------
- -------------------------------------------------------------------------*/
-
-int
LogAccess::marshal_proxy_finish_status_code(char *buf)
{
DEFAULT_INT_FIELD;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d461ead/proxy/logging/LogAccess.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index c54cf93..e0a27b3 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -184,7 +184,6 @@ public:
inkcoreapi virtual int marshal_client_req_header_len(char *); // INT
inkcoreapi virtual int marshal_client_req_body_len(char *); // INT
inkcoreapi virtual int marshal_client_finish_status_code(char *); // INT
- inkcoreapi virtual int marshal_client_gid(char *); // INT
inkcoreapi virtual int marshal_client_accelerator_id(char *); // INT
//
@@ -195,8 +194,6 @@ public:
inkcoreapi virtual int marshal_proxy_resp_content_len(char *); // INT
inkcoreapi virtual int marshal_proxy_resp_status_code(char *); // INT
inkcoreapi virtual int marshal_proxy_resp_header_len(char *); // INT
- inkcoreapi virtual int marshal_proxy_resp_origin_bytes(char *); // INT
- inkcoreapi virtual int marshal_proxy_resp_cache_bytes(char *); // INT
inkcoreapi virtual int marshal_proxy_finish_status_code(char *); // INT
inkcoreapi virtual int marshal_cache_result_code(char *); // INT