TS-2856: Remove proxy.config.spdy.verbose_in and use diags instead
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d0f4d5c4 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d0f4d5c4 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d0f4d5c4 Branch: refs/heads/5.0.x Commit: d0f4d5c47272dd2ab87fc3db6271553864822887 Parents: d22f989 Author: Bryan Call <[email protected]> Authored: Wed May 28 17:29:10 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Wed May 28 17:29:10 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ doc/reference/configuration/records.config.en.rst | 5 ----- mgmt/RecordsConfig.cc | 2 -- proxy/spdy/SpdyClientSession.cc | 4 ++-- proxy/spdy/SpdyCommon.cc | 1 - proxy/spdy/SpdyCommon.h | 1 - 6 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0f4d5c4/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 50ce778..237a519 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2856] Remove proxy.config.spdy.verbose_in and use diags instead + *) [TS-2391] Traffic Server tries to reverse resolve 127.0.0.1 *) [TS-2837] Dangling pointer in URLImpl which may cause core dump http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0f4d5c4/doc/reference/configuration/records.config.en.rst ---------------------------------------------------------------------- diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst index df8dcd4..21a1407 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -2264,11 +2264,6 @@ SPDY Configuration .. note:: Reloading this value affects only new SPDY connections, not existing connects. -.. ts:cv:: CONFIG proxy.config.spdy.verbose_in INT 0 - :reloadable: - - Set the verbose flag for SPDY streams on inbound connections. ``0`` means disable, any other value is enable. - Scheduled Update Configuration ============================== http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0f4d5c4/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index b94e44c..8f80480 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1937,8 +1937,6 @@ RecordElement RecordsConfig[] = { , {RECT_CONFIG, "proxy.config.spdy.initial_window_size_in", RECD_INT, "65536", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} , - {RECT_CONFIG, "proxy.config.spdy.verbose_in", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL} - , {RECT_CONFIG, "proxy.config.spdy.accept_no_activity_timeout", RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} , http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0f4d5c4/proxy/spdy/SpdyClientSession.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc index 47f57c3..665510a 100644 --- a/proxy/spdy/SpdyClientSession.cc +++ b/proxy/spdy/SpdyClientSession.cc @@ -389,7 +389,7 @@ spdy_read_fetch_body_callback(spdylay_session * /*session*/, int32_t stream_id, Debug("spdy", " stream_id:%d, call:%d, length:%ld, already:%" PRId64, stream_id, g_call_cnt, length, already); - if (SPDY_CFG.spdy.verbose) + if (is_debug_tag_set("spdy")) MD5_Update(&req->recv_md5, buf, already); TSVIOReenable(sm->write_vio); @@ -404,7 +404,7 @@ spdy_read_fetch_body_callback(spdylay_session * /*session*/, int32_t stream_id, req->url.c_str(), (end_time - req->start_time)/TS_HRTIME_MSECOND, req->fetch_data_len); unsigned char digest[MD5_DIGEST_LENGTH]; - if (SPDY_CFG.spdy.verbose ) { + if (is_debug_tag_set("spdy")) { MD5_Final(digest, &req->recv_md5); Debug("spdy", "----recv md5sum: "); for (int i = 0; i < MD5_DIGEST_LENGTH; i++) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0f4d5c4/proxy/spdy/SpdyCommon.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCommon.cc b/proxy/spdy/SpdyCommon.cc index d5687f4..7e45b9c 100644 --- a/proxy/spdy/SpdyCommon.cc +++ b/proxy/spdy/SpdyCommon.cc @@ -46,7 +46,6 @@ int spdy_config_load() { REC_EstablishStaticConfigInt32(SPDY_CFG.spdy.max_concurrent_streams, "proxy.config.spdy.max_concurrent_streams_in"); - REC_EstablishStaticConfigBool(SPDY_CFG.spdy.verbose, "proxy.config.spdy.verbose_in"); REC_EstablishStaticConfigInt32(SPDY_CFG.no_activity_timeout_in, "proxy.config.spdy.no_activity_timeout_in"); REC_EstablishStaticConfigInt32(SPDY_CFG.accept_no_activity_timeout, "proxy.config.spdy.accept_no_activity_timeout"); REC_EstablishStaticConfigInt32(SPDY_CFG.spdy.initial_window_size, "proxy.config.spdy.initial_window_size_in"); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0f4d5c4/proxy/spdy/SpdyCommon.h ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCommon.h b/proxy/spdy/SpdyCommon.h index 330a979..b1b37c9 100644 --- a/proxy/spdy/SpdyCommon.h +++ b/proxy/spdy/SpdyCommon.h @@ -56,7 +56,6 @@ using namespace std; #define atomic_dec(a) atomic_fetch_and_sub(a, 1) struct SpdyConfig { - bool verbose; int32_t max_concurrent_streams; int32_t initial_window_size; spdylay_session_callbacks callbacks;
