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 2016/07/02 16:30:01 UTC
[trafficserver] 01/03: TS-4519 Adds a new log tag,
% for the sm_id
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit fadb41bc5509de232c91f43444670a38445583a9
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Mon Jun 13 15:47:38 2016 -0600
TS-4519 Adds a new log tag, %<crid> for the sm_id
---
proxy/logging/Log.cc | 5 +++++
proxy/logging/LogAccess.cc | 9 +++++++++
proxy/logging/LogAccess.h | 3 ++-
proxy/logging/LogAccessHttp.cc | 14 ++++++++++++++
proxy/logging/LogAccessHttp.h | 3 ++-
5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 802f955..1840d85 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -514,6 +514,11 @@ Log::init_fields()
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cfsc", field);
+ field =
+ new LogField("client_req_id", "crid", LogField::sINT, &LogAccess::marshal_client_req_id, &LogAccess::unmarshal_int_to_str);
+ global_field_list.add(field, false);
+ ink_hash_table_insert(field_symbol_hash, "crid", field);
+
// proxy -> client fields
field = new LogField("proxy_resp_content_type", "psct", LogField::STRING, &LogAccess::marshal_proxy_resp_content_type,
(LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index 5f77557..f3a47f6 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -299,6 +299,15 @@ LogAccess::marshal_client_finish_status_code(char *buf)
-------------------------------------------------------------------------*/
int
+LogAccess::marshal_client_req_id(char *buf)
+{
+ DEFAULT_INT_FIELD;
+}
+
+/*-------------------------------------------------------------------------
+ -------------------------------------------------------------------------*/
+
+int
LogAccess::marshal_proxy_resp_content_type(char *buf)
{
DEFAULT_STR_FIELD;
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index 89844f8..3c8d226 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -190,9 +190,10 @@ public:
inkcoreapi virtual int marshal_client_req_tcp_reused(char *); // INT
inkcoreapi virtual int marshal_client_req_is_ssl(char *); // INT
inkcoreapi virtual int marshal_client_req_ssl_reused(char *); // INT
- inkcoreapi virtual int marshal_client_finish_status_code(char *); // INT
inkcoreapi virtual int marshal_client_security_protocol(char *); // STR
inkcoreapi virtual int marshal_client_security_cipher_suite(char *); // STR
+ inkcoreapi virtual int marshal_client_finish_status_code(char *); // INT
+ inkcoreapi virtual int marshal_client_req_id(char *); // INT
//
// proxy -> client fields
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index 96ee885..ff462c5 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -722,6 +722,9 @@ LogAccessHttp::marshal_client_req_ssl_reused(char *buf)
return INK_MIN_ALIGN;
}
+/*-------------------------------------------------------------------------
+ -------------------------------------------------------------------------*/
+
int
LogAccessHttp::marshal_client_finish_status_code(char *buf)
{
@@ -743,6 +746,17 @@ LogAccessHttp::marshal_client_finish_status_code(char *buf)
}
/*-------------------------------------------------------------------------
+ -------------------------------------------------------------------------*/
+
+int
+LogAccessHttp::marshal_client_req_id(char *buf)
+{
+ if (buf) {
+ marshal_int(buf, m_http_sm->sm_id);
+ }
+ return INK_MIN_ALIGN;
+}
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccessHttp::marshal_client_security_protocol(char *buf)
diff --git a/proxy/logging/LogAccessHttp.h b/proxy/logging/LogAccessHttp.h
index 8ddde20..d4ed0f1 100644
--- a/proxy/logging/LogAccessHttp.h
+++ b/proxy/logging/LogAccessHttp.h
@@ -74,9 +74,10 @@ public:
virtual int marshal_client_req_tcp_reused(char *); // INT
virtual int marshal_client_req_is_ssl(char *); // INT
virtual int marshal_client_req_ssl_reused(char *); // INT
- virtual int marshal_client_finish_status_code(char *); // INT
virtual int marshal_client_security_protocol(char *); // STR
virtual int marshal_client_security_cipher_suite(char *); // STR
+ virtual int marshal_client_finish_status_code(char *); // INT
+ virtual int marshal_client_req_id(char *); // INT
//
// proxy -> client fields
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.