Author: zym
Date: Mon Aug 8 09:30:10 2011
New Revision: 1154888
URL: http://svn.apache.org/viewvc?rev=1154888&view=rev
Log:
TS-849 fix some records variables for traffic_line -s setting
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/mgmt/cli/TrafficLine.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1154888&r1=1154887&r2=1154888&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Mon Aug 8 09:30:10 2011
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.0
+ *) [TS-849] fix some variables for traffic_line -s setting
+
*) [TS-874] make asf-dist work with git repo
*) [TS-906] ATS doesn't use proxy.config.http.forward.proxy_auth_to_parent.
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1154888&r1=1154887&r2=1154888&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Mon Aug 8 09:30:10 2011
@@ -485,11 +485,11 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.http.enable_http_info", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.server_max_connections", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_INT, "^[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.server_max_connections", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.origin_max_connections", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_INT, "^[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.origin_max_connections", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.origin_min_keep_alive_connections",
RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "^[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.origin_min_keep_alive_connections",
RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
// ##########################
@@ -764,7 +764,7 @@ RecordElement RecordsConfig[] = {
// ###################
{RECT_CONFIG, "proxy.config.http.errors.log_error_pages", RECD_INT, "1",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.slow.log.threshold", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_INT, "^[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.slow.log.threshold", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
//##############################################################################
@@ -850,7 +850,7 @@ RecordElement RecordsConfig[] = {
#else
"1",
#endif
- RECU_DYNAMIC, RR_NULL, RECC_INT, "^[0-9]+$", RECA_NULL}
+ RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-65535]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.net.sock_recv_buffer_size_in", RECD_INT, "0",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
Modified: trafficserver/traffic/trunk/mgmt/cli/TrafficLine.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/TrafficLine.cc?rev=1154888&r1=1154887&r2=1154888&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/TrafficLine.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/TrafficLine.cc Mon Aug 8 09:30:10 2011
@@ -113,7 +113,7 @@ handleArgInvocation()
TSActionNeedT action;
if ((err = TSRecordSet(SetVar, VarValue, &action)) != TS_ERR_OKAY)
- fprintf(stderr, "%s: Only configuration vars can be set\n",
programName);
+ fprintf(stderr, "%s: Please correct your variable name and|or
value\n", programName);
return err;
}
} else if (*VarValue != '\0') { // We have a value but no variable to
set
