You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/12/06 05:35:37 UTC
[03/11] git commit: TS-2401: Remove unused global management_directory
TS-2401: Remove unused global management_directory
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bb26f42a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bb26f42a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bb26f42a
Branch: refs/heads/master
Commit: bb26f42affd1983370439a0337b35dc66db80879
Parents: 563c1e9
Author: James Peach <jp...@apache.org>
Authored: Wed Nov 27 14:40:07 2013 -0800
Committer: James Peach <jp...@apache.org>
Committed: Thu Dec 5 20:33:48 2013 -0800
----------------------------------------------------------------------
doc/reference/commands/traffic_server.en.rst | 2 --
proxy/Main.cc | 12 ------------
proxy/Main.h | 1 -
proxy/logging/LogStandalone.cc | 11 -----------
proxy/sac.cc | 3 ---
5 files changed, 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/doc/reference/commands/traffic_server.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/commands/traffic_server.en.rst b/doc/reference/commands/traffic_server.en.rst
index 8ae9aab..442a369 100644
--- a/doc/reference/commands/traffic_server.en.rst
+++ b/doc/reference/commands/traffic_server.en.rst
@@ -52,8 +52,6 @@ Description
.. option:: -M, --remote_management
-.. option:: -d DIR, --management_dir DIR
-
.. option:: -C CMD, --command CMD
.. option:: -k, --clear_hostdb
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index b5a3873..3cdd0f4 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -144,7 +144,6 @@ char cluster_host[MAXDNAME + 1] = DEFAULT_CLUSTER_HOST;
static char command_string[512] = "";
int remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
-char management_directory[PATH_NAME_MAX+1]; // Layout->sysconfdir
char system_root_dir[PATH_NAME_MAX + 1]; // Layout->prefix
char system_runtime_dir[PATH_NAME_MAX + 1]; // Layout->runtimedir
char system_config_directory[PATH_NAME_MAX + 1]; // Layout->sysconfdir
@@ -210,7 +209,6 @@ static const ArgumentDescription argument_descriptions[] = {
{"interval", 'i', "Statistics Interval", "I", &show_statistics, "PROXY_STATS_INTERVAL", NULL},
{"remote_management", 'M', "Remote Management", "T", &remote_management_flag, "PROXY_REMOTE_MANAGEMENT", NULL},
- {"management_dir", 'd', "Management Directory", "S255", &management_directory, "PROXY_MANAGEMENT_DIRECTORY", NULL},
{"command", 'C', "Maintenance Command to Execute", "S511", &command_string, "PROXY_COMMAND_STRING", NULL},
{"clear_hostdb", 'k', "Clear HostDB on Startup", "F", &auto_clear_hostdb_flag, "PROXY_CLEAR_HOSTDB", NULL},
{"clear_cache", 'K', "Clear Cache on Startup", "F", &cacheProcessor.auto_clear_flag, "PROXY_CLEAR_CACHE", NULL},
@@ -347,15 +345,6 @@ initialize_process_manager()
remote_management_flag = true;
}
- if (access(management_directory, R_OK) == -1) {
- ink_strlcpy(management_directory, Layout::get()->sysconfdir, sizeof(management_directory));
- if (access(management_directory, R_OK) == -1) {
- fprintf(stderr,"unable to access() management path '%s': %d, %s\n", management_directory, errno, strerror(errno));
- fprintf(stderr,"please set management path via command line '-d <management directory>'\n");
- _exit(1);
- }
- }
-
RecProcessInit(remote_management_flag ? RECM_CLIENT : RECM_STAND_ALONE, diags);
if (!remote_management_flag) {
@@ -1303,7 +1292,6 @@ main(int /* argc ATS_UNUSED */, char **argv)
// Before accessing file system initialize Layout engine
Layout::create();
ink_strlcpy(system_root_dir, Layout::get()->prefix, sizeof(system_root_dir));
- ink_strlcpy(management_directory, Layout::get()->sysconfdir, sizeof(management_directory));
chdir_root(); // change directory to the install root of traffic server.
process_args(argument_descriptions, countof(argument_descriptions), argv);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/proxy/Main.h
----------------------------------------------------------------------
diff --git a/proxy/Main.h b/proxy/Main.h
index d7a9a12..363fffc 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -55,7 +55,6 @@ extern char cluster_host[MAXDNAME + 1];
extern int cluster_port_number;
extern int remote_management_flag;
-extern char management_directory[PATH_NAME_MAX + 1];
inkcoreapi extern int qt_accept_file_descriptor;
inkcoreapi extern int cache_clustering_enabled;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/proxy/logging/LogStandalone.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index 366dac3..014baac 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -60,7 +60,6 @@ char system_root_dir[PATH_NAME_MAX + 1] = "";
char system_config_directory[PATH_NAME_MAX + 1] = "";
char system_runtime_dir[PATH_NAME_MAX + 1] = "";
char system_log_dir[PATH_NAME_MAX + 1] = "";
-char management_directory[PATH_NAME_MAX + 1] = "";
char error_tags[1024] = "";
char action_tags[1024] = "";
@@ -100,16 +99,6 @@ initialize_process_manager()
remote_management_flag = true;
}
- if (management_directory[0] == '\0') {
- ink_strlcpy(management_directory, Layout::get()->sysconfdir, sizeof(management_directory));
- if (access(management_directory, R_OK) == -1) {
- fprintf(stderr,"unable to access() management path '%s': %d, %s\n",
- management_directory, errno, strerror(errno));
- fprintf(stderr,"please set management path via command line '-d <management directory>'\n");
- _exit(1);
- }
- }
-
// diags should have been initialized by caller, e.g.: sac.cc
ink_assert(diags);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb26f42a/proxy/sac.cc
----------------------------------------------------------------------
diff --git a/proxy/sac.cc b/proxy/sac.cc
index db9571e..f094e04 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -97,9 +97,6 @@ main(int /* argc ATS_UNUSED */, char *argv[])
exit(1);
}
- management_directory[0] = 0;
- ink_strlcat(management_directory, system_config_directory, sizeof(management_directory));
-
// check for the version number request
//
if (version_flag) {