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/08/02 00:12:35 UTC
[1/2] git commit: TS-2086 Remove a few more unused configs
Updated Branches:
refs/heads/master 5b80237d7 -> 7e26b6845
TS-2086 Remove a few more unused configs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0520723a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0520723a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0520723a
Branch: refs/heads/master
Commit: 0520723ac42f5b01b068d3762971b4dd4648cfc9
Parents: 5b80237
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Aug 1 11:08:40 2013 +0200
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Aug 2 00:08:03 2013 +0200
----------------------------------------------------------------------
.gitignore | 1 +
ci/jenkins/records.config | 1 -
.../configuration/records.config.en.rst | 12 ------------
example/app-template/records.config.in | 1 -
lib/perl/lib/Apache/TS/AdminClient.pm | 9 ---------
mgmt/RecordsConfig.cc | 20 --------------------
mgmt/Rollback.cc | 4 ++--
mgmt/api/remote/APITestCliRemote.cc | 10 +---------
proxy/Main.cc | 2 --
proxy/config/records.config.default.in | 1 -
10 files changed, 4 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f2f4d0c..9a4b056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
*.lo
*.la
*.log
+*.trs
.deps
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/ci/jenkins/records.config
----------------------------------------------------------------------
diff --git a/ci/jenkins/records.config b/ci/jenkins/records.config
index 4f5bdfb..239e901 100644
--- a/ci/jenkins/records.config
+++ b/ci/jenkins/records.config
@@ -23,7 +23,6 @@ CONFIG proxy.config.proxy_name STRING ats.boot.org
CONFIG proxy.config.config_dir STRING etc/trafficserver
CONFIG proxy.config.proxy_binary_opts STRING -M
CONFIG proxy.config.env_prep STRING example_prep.sh
-CONFIG proxy.config.temp_dir STRING /tmp
CONFIG proxy.config.alarm_email STRING nobody
CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
CONFIG proxy.config.output.logfile STRING traffic.out
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/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 3b0d1e2..510e681 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -136,14 +136,6 @@ System Variables
The name of the executable that runs the ``traffic_manager`` process.
-.. ts:confvar:: CONFIG proxy.config.cli_binary STRING traffic_line
-
- The name of the executable that runs the command-line interface :program:`traffic_line`.
-
-.. ts:confvar:: CONFIG proxy.config.watch_script STRING traffic_cop
-
- The name of the executable that runs the ``traffic_cop`` process.
-
.. ts:confvar:: CONFIG proxy.config.env_prep STRING
The script executed before the ``traffic_manager`` process spawns
@@ -153,10 +145,6 @@ System Variables
The directory that contains Traffic Server configuration files.
-.. ts:confvar:: CONFIG proxy.config.temp_dir STRING /tmp
-
- The directory used for Traffic Server temporary files.
-
.. ts:confvar:: CONFIG proxy.config.alarm_email STRING
:reloadable:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/example/app-template/records.config.in
----------------------------------------------------------------------
diff --git a/example/app-template/records.config.in b/example/app-template/records.config.in
index 148ed5e..3a85b7b 100644
--- a/example/app-template/records.config.in
+++ b/example/app-template/records.config.in
@@ -19,7 +19,6 @@
##############################################################################
CONFIG proxy.config.bin_path STRING bin
CONFIG proxy.config.config_dir STRING etc/@PACKAGE@
-CONFIG proxy.config.temp_dir STRING /tmp
CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
CONFIG proxy.config.cop.linux_min_swapfree_kb INT 10240
CONFIG proxy.config.cop.linux_min_memfree_kb INT 10240
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/lib/perl/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
index 3f86033..2e171f4 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -306,7 +306,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.cache.url_hash_method
proxy.config.cache.vary_on_user_agent
proxy.config.cache.mutex_retry_delay
- proxy.config.cli_binary
proxy.config.cluster.cluster_configuration
proxy.config.cluster.cluster_load_clear_duration
proxy.config.cluster.cluster_load_exceed_duration
@@ -339,7 +338,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.cop.core_signal
proxy.config.cop.linux_min_memfree_kb
proxy.config.cop.linux_min_swapfree_kb
- proxy.config.cop_name
proxy.config.core_limit
proxy.config.diags.action.enabled
proxy.config.diags.action.tags
@@ -373,7 +371,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.exec_thread.autoconfig.scale
proxy.config.exec_thread.limit
proxy.config.header.parse.no_host_url_redirect
- proxy.config.history_info_enabled
proxy.config.hostdb
proxy.config.hostdb.cluster
proxy.config.hostdb.cluster.round_robin
@@ -596,7 +593,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.log.squid_log_name
proxy.config.log.xml_config_file
proxy.config.manager_binary
- proxy.config.manager_name
proxy.config.net.connections_throttle
proxy.config.net.listen_backlog
proxy.config.net_snapshot_filename
@@ -628,7 +624,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.process_manager.enable_mgmt_port
proxy.config.process_manager.mgmt_port
proxy.config.process_manager.timeout
- proxy.config.process_state_dump_mode
proxy.config.product_company
proxy.config.product_name
proxy.config.product_vendor
@@ -640,7 +635,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.res_track_memory
proxy.config.reverse_proxy.enabled
proxy.config.reverse_proxy.oldasxbehavior
- proxy.config.server_name
proxy.config.snapshot_dir
proxy.config.socks.accept_enabled
proxy.config.socks.accept_port
@@ -681,7 +675,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.ssl.server_port
proxy.config.ssl.server.private_key.path
proxy.config.stack_dump_enabled
- proxy.config.start_script
proxy.config.stat_collector.interval
proxy.config.stat_collector.port
proxy.config.stats.config_file
@@ -689,7 +682,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.stats.snap_frequency
proxy.config.syslog_facility
proxy.config.system.mmap_max
- proxy.config.temp_dir
proxy.config.thread.default.stacksize
proxy.config.udp.free_cancelled_pkts_sec
proxy.config.udp.periodic_cleanup
@@ -711,7 +703,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.vmap.addr_file
proxy.config.vmap.down_up_timeout
proxy.config.vmap.enabled
- proxy.config.watch_script
=head1 LICENSE
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 39931ad..b5b9972 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -42,12 +42,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.product_name", RECD_STRING, "Traffic Server", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.cop_name", RECD_STRING, "Traffic Cop", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.manager_name", RECD_STRING, "Traffic Manager", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.server_name", RECD_STRING, "Traffic Server", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.proxy_name", RECD_STRING, "<proxy_name>", RECU_DYNAMIC, RR_REQUIRED, RECC_STR, ".+", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.bin_path", RECD_STRING, "bin", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
@@ -55,15 +49,9 @@ RecordElement RecordsConfig[] = {
{RECT_CONFIG, "proxy.config.proxy_binary", RECD_STRING, "traffic_server", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.manager_binary", RECD_STRING, "traffic_manager", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
- , // required for traffic_cop
- {RECT_CONFIG, "proxy.config.cli_binary", RECD_STRING, "traffic_line", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.watch_script", RECD_STRING, "traffic_cop", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.proxy_binary_opts", RECD_STRING, "-M", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.start_script", RECD_STRING, "start", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.env_prep", RECD_STRING, "example_prep.sh", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.config_dir", RECD_STRING, TS_BUILD_SYSCONFDIR, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
@@ -71,8 +59,6 @@ RecordElement RecordsConfig[] = {
// Jira TS-21
{RECT_CONFIG, "proxy.config.local_state_dir", RECD_STRING, TS_BUILD_RUNTIMEDIR, RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.temp_dir", RECD_STRING, "/tmp", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.alarm_email", RECD_STRING, TS_PKGSYSUSER, RECU_DYNAMIC, RR_NULL, RECC_STR, ".*", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.syslog_facility", RECD_STRING, "LOG_DAEMON", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
@@ -99,12 +85,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.cache.max_disk_errors", RECD_INT, "5", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- //# 0 = disable
- {RECT_CONFIG, "proxy.config.history_info_enabled", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- //# 0 = disable
- {RECT_CONFIG, "proxy.config.process_state_dump_mode", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.output.logfile", RECD_STRING, "traffic.out", RECU_RESTART_TC, RR_REQUIRED, RECC_NULL, NULL,
RECA_NULL}
,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/mgmt/Rollback.cc
----------------------------------------------------------------------
diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc
index 39c747c..e27a745 100644
--- a/mgmt/Rollback.cc
+++ b/mgmt/Rollback.cc
@@ -41,9 +41,9 @@ const char *RollbackStrings[] = { "Rollback Ok",
"System Call Error",
"Invalid Version - Version Numbers Must Increase"
};
+
Rollback::Rollback(const char *baseFileName, bool root_access_needed_)
- :
-root_access_needed(root_access_needed_)
+ : root_access_needed(root_access_needed_)
{
char configTmp[PATH_NAME_MAX + 1];
version_t highestSeen; // the highest backup version
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/mgmt/api/remote/APITestCliRemote.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/remote/APITestCliRemote.cc b/mgmt/api/remote/APITestCliRemote.cc
index 5d15632..57f6ebc 100644
--- a/mgmt/api/remote/APITestCliRemote.cc
+++ b/mgmt/api/remote/APITestCliRemote.cc
@@ -1247,7 +1247,7 @@ test_record_get_mlt(void)
TSStringList name_list;
TSList rec_list;
int i, num;
- char *v1, *v2, *v3, *v4, *v5, *v6, *v7, *v8;
+ char *v1, *v2, *v3, *v6, *v7, *v8;
TSError ret;
name_list = TSStringListCreate();
@@ -1262,12 +1262,6 @@ test_record_get_mlt(void)
const size_t v3_size = (sizeof(char) * (strlen("proxy.config.manager_binary") + 1));
v3 = (char *) TSmalloc(v3_size);
ink_strlcpy(v3, "proxy.config.manager_binary", v3_size);
- const size_t v4_size = (sizeof(char) * (strlen("proxy.config.cli_binary") + 1));
- v4 = (char *) TSmalloc(v4_size);
- ink_strlcpy(v4, "proxy.config.cli_binary", v4_size);
- const size_t v5_size = (sizeof(char) * (strlen("proxy.config.watch_script") + 1));
- v5 = (char *) TSmalloc(v5_size);
- ink_strlcpy(v5, "proxy.config.watch_script", v5_size);
const size_t v6_size = (sizeof(char) * (strlen("proxy.config.env_prep") + 1));
v6 = (char *) TSmalloc(v6_size);
ink_strlcpy(v6, "proxy.config.env_prep", v6_size);
@@ -1282,8 +1276,6 @@ test_record_get_mlt(void)
TSStringListEnqueue(name_list, v1);
TSStringListEnqueue(name_list, v2);
TSStringListEnqueue(name_list, v3);
- TSStringListEnqueue(name_list, v4);
- TSStringListEnqueue(name_list, v5);
TSStringListEnqueue(name_list, v6);
TSStringListEnqueue(name_list, v7);
TSStringListEnqueue(name_list, v8);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 590e4de..d0785d5 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -154,7 +154,6 @@ char system_log_dir[PATH_NAME_MAX + 1]; // Layout->logdir
static char error_tags[1024] = "";
static char action_tags[1024] = "";
static int show_statistics = 0;
-static int history_info_enabled = 1;
static inkcoreapi DiagsConfig *diagsConfig = NULL;
HttpBodyFactory *body_factory = NULL;
@@ -1450,7 +1449,6 @@ main(int /* argc ATS_UNUSED */, char **argv)
// pmgmt->start() must occur after initialization of Diags but
// before calling RecProcessInit()
- TS_ReadConfigInteger(history_info_enabled, "proxy.config.history_info_enabled");
TS_ReadConfigInteger(res_track_memory, "proxy.config.res_track_memory");
init_http_header();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0520723a/proxy/config/records.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index ffe4ce6..b757418 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -23,7 +23,6 @@ CONFIG proxy.config.proxy_name STRING @build_machine@
CONFIG proxy.config.config_dir STRING @rel_sysconfdir@
CONFIG proxy.config.proxy_binary_opts STRING -M
CONFIG proxy.config.env_prep STRING example_prep.sh
-CONFIG proxy.config.temp_dir STRING /tmp
CONFIG proxy.config.alarm_email STRING @pkgsysuser@
CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
CONFIG proxy.config.output.logfile STRING traffic.out
[2/2] git commit: Added TS-2086.
Posted by zw...@apache.org.
Added TS-2086.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7e26b684
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7e26b684
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7e26b684
Branch: refs/heads/master
Commit: 7e26b6845b2fe57f6c5eddd8e082c6cdde07e9d8
Parents: 0520723
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Aug 2 00:08:41 2013 +0200
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Aug 2 00:08:41 2013 +0200
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7e26b684/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 67cd6d2..5250459 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 3.3.5
+ *) [TS-2086] Remove a few more unused configs.
+
*) [TS-1685] Remove TS_MICRO and fellas.
*) [TS-1255] Add more overridable configurations, and fix bugs in how we