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 2010/06/30 20:32:25 UTC
svn commit: r959403 - in /trafficserver/traffic/trunk: example/app-template/
iocore/utils/ proxy/ proxy/mgmt2/ proxy/mgmt2/api2/include/
proxy/mgmt2/cli/ proxy/mgmt2/cop/ rc/
Author: zwoop
Date: Wed Jun 30 18:32:24 2010
New Revision: 959403
URL: http://svn.apache.org/viewvc?rev=959403&view=rev
Log:
TS-389: Cleanup after "layout changes".
Tested: Fc13
Author: Zhao Yongming
Review: leif
Modified:
trafficserver/traffic/trunk/example/app-template/app-template.h
trafficserver/traffic/trunk/iocore/utils/Layout.cc
trafficserver/traffic/trunk/proxy/Main.h
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/Main.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc
trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
trafficserver/traffic/trunk/rc/trafficserver.in
Modified: trafficserver/traffic/trunk/example/app-template/app-template.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/app-template/app-template.h?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/app-template/app-template.h (original)
+++ trafficserver/traffic/trunk/example/app-template/app-template.h Wed Jun 30 18:32:24 2010
@@ -30,7 +30,6 @@
#define DEFAULT_LOCAL_STATE_DIRECTORY "var/trafficserver"
#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "etc/trafficserver"
#define DEFAULT_LOG_DIRECTORY "var/log/trafficserver"
-#define DEFAULT_TS_DIRECTORY_FILE PREFIX "/etc/traffic_server"
#define DEFAULT_NUMBER_OF_THREADS ink_number_of_processors()
#define DEFAULT_NUMBER_OF_UDP_THREADS 1
Modified: trafficserver/traffic/trunk/iocore/utils/Layout.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Layout.cc?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Layout.cc (original)
+++ trafficserver/traffic/trunk/iocore/utils/Layout.cc Wed Jun 30 18:32:24 2010
@@ -24,8 +24,6 @@
#include "inktomi++.h"
#include "I_Layout.h"
-#define DEFAULT_TS_DIRECTORY_FILE SYSCONFIGDIR "/trafficserver-root"
-
static Layout *layout = NULL;
Layout *
@@ -146,7 +144,6 @@ Layout::Layout(const char *_prefix)
prefix = xstrdup(_prefix);
}
else {
- FILE *fp;
char *env_path;
char path[PATH_MAX];
int len;
@@ -164,29 +161,8 @@ Layout::Layout(const char *_prefix)
--len;
}
} else {
- if ((fp = fopen(DEFAULT_TS_DIRECTORY_FILE, "r")) != NULL) {
- if (fgets(path, sizeof(path), fp) == NULL) {
- fclose(fp);
- ink_error("Invalid contents in %s. "
- "Please set correct path in env variable TS_ROOT\n",
- DEFAULT_TS_DIRECTORY_FILE);
- return;
- }
- fclose(fp);
- // strip newline if it exists
- len = strlen(path);
- while (len > 1 && isspace((unsigned int)(path[len - 1]))) {
- path[len - 1] = '\0';
- --len;
- }
- if (path[len - 1] == '/') {
- path[len - 1] = '\0';
- }
-
- } else {
// Use compile time --prefix
ink_strncpy(path, PREFIX, sizeof(path));
- }
}
if (access(path, R_OK) == -1) {
Modified: trafficserver/traffic/trunk/proxy/Main.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.h?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.h (original)
+++ trafficserver/traffic/trunk/proxy/Main.h Wed Jun 30 18:32:24 2010
@@ -51,7 +51,6 @@
#define DEFAULT_LOCAL_STATE_DIRECTORY "var/trafficserver"
#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "etc/trafficserver"
#define DEFAULT_LOG_DIRECTORY "var/log/trafficserver"
-#define DEFAULT_TS_DIRECTORY_FILE PREFIX "/etc/traffic_server"
//
// Global Data
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Wed Jun 30 18:32:24 2010
@@ -404,7 +404,6 @@ install-data-local:
install-data-hook:
-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir)
- -echo $(DESTDIR)$(prefix) > $(DESTDIR)$(sysconfdir)/trafficserver-root
-echo "<TS_VERSION> $(PACKAGE_VERSION)" > $(DESTDIR)$(pkgsysconfdir)/trafficserver-release
install-exec-local:
@@ -415,6 +414,5 @@ install-exec-hook:
uninstall-hook:
-rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir) $(DESTDIR)$(pkgcachedir)
- -rm -f $(DESTDIR)$(sysconfdir)/trafficserver-root
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.h?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.h Wed Jun 30 18:32:24 2010
@@ -40,7 +40,6 @@
#define DEFAULT_LOCAL_STATE_DIRECTORY "var/trafficserver"
#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "etc/trafficserver"
#define DEFAULT_LOG_DIRECTORY "var/log/trafficserver"
-#define DEFAULT_TS_DIRECTORY_FILE PREFIX "/etc/traffic_server"
void MgmtShutdown(int status);
void fileUpdated(char *fname);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h Wed Jun 30 18:32:24 2010
@@ -1118,7 +1118,7 @@ typedef enum
* mgmt plugins should be specified in the records.config variable
* "proxy.config.plugin.plugin_mgmt_dir" (if this directory is a relative
* pathname then, it is assumed that it is relative to the root directory
- * stored in DEFAULT_TS_DIRECTORY_FILE). The default value is "etc/trafficserver/plugins_mgmt",
+ * defined in TS_ROOT). The default value is "etc/trafficserver/plugins_mgmt",
* which tells Traffic Manager to use the directory plugins_mgmt located in the
* same directory as records.config. You should place your shared library (*.so)
* into the directory you have specified.
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc Wed Jun 30 18:32:24 2010
@@ -298,8 +298,7 @@ cli_write_timeout(int fd, const char *da
} /* End cli_write_timeout */
/*
- This function is copied from cli2/CliMgmtUtils.cc. Gets the install directory from
-DEFAULT_TS_DIRECTORY_FILE
+ This function is copied from cli2/CliMgmtUtils.cc. Get layout directory.
*/
int
GetTSDirectory(char *ts_path, size_t ts_path_len)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Wed Jun 30 18:32:24 2010
@@ -1798,14 +1798,6 @@ init_signals()
static void
init_config_dir()
{
- // Fix INKqa05946
- //
- // The traffic_cop binary should be run from either the TS root
- // directory or the bin/ directory. In either case, there should
- // always be a etc/trafficserver directory there.
- //
- // If there is no DEFAULT_TS_DIRECTORY_FILE file to be found, we will
- // assume there is one in the current working directory.
struct stat info;
Modified: trafficserver/traffic/trunk/rc/trafficserver.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/rc/trafficserver.in?rev=959403&r1=959402&r2=959403&view=diff
==============================================================================
--- trafficserver/traffic/trunk/rc/trafficserver.in (original)
+++ trafficserver/traffic/trunk/rc/trafficserver.in Wed Jun 30 18:32:24 2010
@@ -67,12 +67,7 @@ test -x $ESED || ESED=sed
PATH=/usr/sbin:/usr/bin:/sbin:/bin
DESC="start/stop Traffic Server"
NAME=trafficserver
-
-if [ -f @exp_sysconfdir@/trafficserver-root ]; then
- TS_PREFIX=`${HEAD} -1 @exp_sysconfdir@/trafficserver-root`
-else
- TS_PREFIX="@prefix@"
-fi
+TS_PREFIX="@prefix@"
TS_ROOT=${TS_ROOT:-$TS_PREFIX}
# TS_BASE is offset inside the file system from where the layout starts