Updated Branches: refs/heads/TS-645-hard-restart [created] b5c79b2de
remove StopTrafficServer() and StartTrafficServer() from traffic_shell Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3817006d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3817006d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3817006d Branch: refs/heads/TS-645-hard-restart Commit: 3817006d804907bf400bd993e8cce880ce802524 Parents: 0fc0820 Author: Igor GaliÄ <i.ga...@brainsware.org> Authored: Mon Jan 20 15:22:21 2014 +0100 Committer: Igor GaliÄ <i.ga...@brainsware.org> Committed: Mon Jan 20 15:22:21 2014 +0100 ---------------------------------------------------------------------- cmd/traffic_shell/CliMgmtUtils.cc | 37 -------------------- cmd/traffic_shell/CliMgmtUtils.h | 2 -- cmd/traffic_shell/cli_detailed_command_list.txt | 18 ---------- 3 files changed, 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3817006d/cmd/traffic_shell/CliMgmtUtils.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_shell/CliMgmtUtils.cc b/cmd/traffic_shell/CliMgmtUtils.cc index 222e334..1b3ee93 100644 --- a/cmd/traffic_shell/CliMgmtUtils.cc +++ b/cmd/traffic_shell/CliMgmtUtils.cc @@ -557,43 +557,6 @@ GetTSDirectory(char *ts_path, size_t ts_path_len) } int -StopTrafficServer() -{ - char ts_path[PATH_NAME_MAX + 1]; - char stop_ts[1024]; - - if (GetTSDirectory(ts_path,sizeof(ts_path))) { - return CLI_ERROR; - } - snprintf(stop_ts, sizeof(stop_ts), "%s/stop_traffic_server", ts_path); - if (system(stop_ts) == -1) - return CLI_ERROR; - - return 0; -} - -int -StartTrafficServer() -{ - char ts_path[PATH_NAME_MAX + 1]; - char start_ts[1024]; - - if (GetTSDirectory(ts_path,sizeof(ts_path))) { - return CLI_ERROR; - } - // root user should start_traffic_shell as inktomi user - if (getuid() == 0) { - snprintf(start_ts, sizeof(start_ts), "/bin/su - inktomi -c \"%s/start_traffic_server\"", ts_path); - } else { - snprintf(start_ts, sizeof(start_ts), "%s/start_traffic_server", ts_path); - } - if (system(start_ts) == -1) - return CLI_ERROR; - - return 0; -} - -int Cli_CheckPluginStatus(TSString plugin) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3817006d/cmd/traffic_shell/CliMgmtUtils.h ---------------------------------------------------------------------- diff --git a/cmd/traffic_shell/CliMgmtUtils.h b/cmd/traffic_shell/CliMgmtUtils.h index 3798f70..17357c4 100644 --- a/cmd/traffic_shell/CliMgmtUtils.h +++ b/cmd/traffic_shell/CliMgmtUtils.h @@ -147,6 +147,4 @@ int cliCheckIfEnabled(const char *command); int GetTSDirectory(char *ts_path, size_t ts_path_len); -int StopTrafficServer(); -int StartTrafficServer(); int Cli_CheckPluginStatus(TSString plugin); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3817006d/cmd/traffic_shell/cli_detailed_command_list.txt ---------------------------------------------------------------------- diff --git a/cmd/traffic_shell/cli_detailed_command_list.txt b/cmd/traffic_shell/cli_detailed_command_list.txt index 54b2776..c297a95 100644 --- a/cmd/traffic_shell/cli_detailed_command_list.txt +++ b/cmd/traffic_shell/cli_detailed_command_list.txt @@ -889,24 +889,6 @@ name Proxy Name config1 ts# -start Start Proxy Software - syntax: config:start - args: none - behavior: Run start_traffic_server. - - ts# config:start - +OK - ts# - -stop Stop Proxy Software - syntax: config:stop - args: none - behavior: Run stop_traffic_server. - - ts# config:stop - +OK - ts# - write Write Upgrade File (IFC file) syntax: config:write ifc-head ts-version <ts_version> build-date <date> platform <platform> nodes <no_of_nodes> config:write feature <feature-string>
