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 2014/04/23 19:02:35 UTC

[3/3] git commit: TS-645: remove StopTrafficServer() and StartTrafficServer() from traffic_shell

TS-645: 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/a2d3a52a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a2d3a52a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a2d3a52a

Branch: refs/heads/master
Commit: a2d3a52a67d963eea71871b92572b063e33c7aaf
Parents: a3b17cc
Author: Igor Galić <i....@brainsware.org>
Authored: Mon Jan 20 15:22:21 2014 +0100
Committer: James Peach <jp...@apache.org>
Committed: Wed Apr 23 10:02:05 2014 -0700

----------------------------------------------------------------------
 CHANGES                                         |  2 ++
 cmd/traffic_shell/CliMgmtUtils.cc               | 37 --------------------
 cmd/traffic_shell/CliMgmtUtils.h                |  2 --
 cmd/traffic_shell/cli_detailed_command_list.txt | 18 ----------
 4 files changed, 2 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a2d3a52a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 42a6630..906d9b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-645] Remove broken hard restart from traffic_shell.
+
   *) [TS-2562] Improve init script support for Debian/Ubuntu.
    Author: Tomasz Kuzemko <to...@kuzemko.net>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a2d3a52a/cmd/traffic_shell/CliMgmtUtils.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_shell/CliMgmtUtils.cc b/cmd/traffic_shell/CliMgmtUtils.cc
index 67666cd..7d41349 100644
--- a/cmd/traffic_shell/CliMgmtUtils.cc
+++ b/cmd/traffic_shell/CliMgmtUtils.cc
@@ -555,43 +555,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/a2d3a52a/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/a2d3a52a/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>