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/09/23 21:52:16 UTC
[02/20] git commit: TS-2206 The trafficserver RC script does not use
absolute path to traffic_line binary.
TS-2206 The trafficserver RC script does not use absolute path to
traffic_line binary.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a6067e19
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a6067e19
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a6067e19
Branch: refs/heads/5.0.x
Commit: a6067e19b3f2fe8daa5f8f9509ec11f243c4c60c
Parents: 632b3a4
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Sep 10 10:08:14 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Sep 10 10:08:14 2013 -0600
----------------------------------------------------------------------
CHANGES | 3 +++
rc/trafficserver.in | 12 ++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a6067e19/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 20e1ef9..d042183 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.1.0
+ *) [TS-2206] The trafficserver RC script does not use absolute path to
+ traffic_line binary.
+
*) [TS-2207] CentOS5 out of tree perl module build fails.
*) [TS-1637] Fix nodes as idle/dead if we have not heard from them in awhile
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a6067e19/rc/trafficserver.in
----------------------------------------------------------------------
diff --git a/rc/trafficserver.in b/rc/trafficserver.in
index 597c7a9..5e1d0a4 100644
--- a/rc/trafficserver.in
+++ b/rc/trafficserver.in
@@ -103,13 +103,13 @@ eval TS_BASE="`echo $TS_ROOT | ${ESED} -e 's;@prefix@$;;'`"
TC_NAME=${TC_NAME:-traffic_cop}
TM_NAME=${TM_NAME:-traffic_manager}
TS_NAME=${TS_NAME:-traffic_server}
-TL_NAME=${TL_NAME:-traffic_line}
TC_DAEMON=${TC_DAEMON:-$TS_BASE@exp_bindir@/traffic_cop}
TC_DAEMON_ARGS=""
TM_DAEMON=${TM_DAEMON:-$TS_BASE@exp_bindir@/traffic_manager}
TM_DAEMON_ARGS=""
TS_DAEMON=${TS_DAEMON:-$TS_BASE@exp_bindir@/traffic_server}
TS_DAEMON_ARGS=""
+TL_BINARY=${TL_BINARY:-$TS_BASE@exp_bindir@/traffic_line}
TC_PIDFILE=${TC_PIDFILE:-$TS_BASE@exp_runtimedir@/cop.lock}
TM_PIDFILE=${TM_PIDFILE:-$TS_BASE@exp_runtimedir@/manager.lock}
TS_PIDFILE=${TS_PIDFILE:-$TS_BASE@exp_runtimedir@/server.lock}
@@ -346,22 +346,22 @@ case "$1" in
if [ "$DISTRIB_ID" = "ubuntu" -o "$DISTRIB_ID" = "debian" ] ; then
test "x$VERBOSE" != "xno" && log_daemon_msg "Reloading ${NAME}:"
retval=0
- $TL_NAME -x
+ $TL_BINARY -x
test "$?" -ne 0 -a "$?" -ne 1 && retval=1
test "x$VERBOSE" != "xno" && log_daemon_msg "$retval"
exit "$retval"
elif [ "$DISTRIB_ID" = "fedora" -o "$DISTRIB_ID" = "redhat" ]; then
- action "Reloading ${NAME}:" $TL_NAME -x
+ action "Reloading ${NAME}:" $TL_BINARY -x
elif [ "$DISTRIB_ID" = "suse" ]; then
echo -n "Reloading ${NAME}"
- $TL_NAME -x
+ $TL_BINARY -x
rc_status -v
elif [ "$DISTRIB_ID" = "Darwin" ]; then
echo "Reloading ${NAME}"
- $TL_NAME -x
+ $TL_BINARY -x
elif [ "$DISTRIB_ID" = "FreeBSD" ]; then
echo "Reloading ${NAME}"
- $TL_NAME -x
+ $TL_BINARY -x
else
echo "This script needs to be ported to this OS"
exit 1