[trafficserver] branch master updated: Setup better defaults for service file logic

[dr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dragon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 117f54d  Setup better defaults for service file logic
117f54d is described below

commit 117f54d1c6e6b05fcda8cfa34288f79e5759bfc4
Author: Jason Kenny <dr...@live.com>
AuthorDate: Mon Aug 6 12:20:01 2018 -0500

    Setup better defaults for service file logic
    
    Add support for the TS_RUNROOT feature.
    Tweak stop logic to clean up files.
    Don't hide output from traffic_manger from service daemon.
---
 rc/trafficserver.in         |  7 +++++++
 rc/trafficserver.service.in | 11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/rc/trafficserver.in b/rc/trafficserver.in
index a726115..49a04f9 100644
--- a/rc/trafficserver.in
+++ b/rc/trafficserver.in
@@ -97,6 +97,12 @@ SLEEP_TIME=5
 TS_PREFIX="@prefix@"
 
 TS_ROOT=${TS_ROOT:-$TS_PREFIX}
+
+# ####################################
+# run root is not used by default
+# set this value if using a custom layout structure
+# TS_RUNROOT="" 
+
 # TS_BASE is offset inside the file system from where the layout starts
 # For standard installations TS_BASE will be empty
 eval TS_BASE="`echo $TS_ROOT | ${ESED} -e 's;@prefix@$;;'`"
@@ -108,6 +114,7 @@ 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_ctl}
+TY_BINARY=${TL_BINARY:-$TS_BASE@exp_bindir@/traffic_layout}
 TM_PIDFILE=${TM_PIDFILE:-$TS_BASE@exp_runtimedir@/manager.lock}
 TS_PIDFILE=${TS_PIDFILE:-$TS_BASE@exp_runtimedir@/server.lock}
 # number of times to retry check on pid lock file
diff --git a/rc/trafficserver.service.in b/rc/trafficserver.service.in
index 41f585d..0768549 100644
--- a/rc/trafficserver.service.in
+++ b/rc/trafficserver.service.in
@@ -22,9 +22,16 @@ After=syslog.target network.target
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/trafficserver
-PIDFile=@exp_runtimedir@/manager.pid
-ExecStart=@exp_bindir@/traffic_manager --bind_stdout @exp_logdir@/traffic.out --bind_stderr @exp_logdir@/traffic.out $TM_DAEMON_ARGS
+ExecStart=@exp_bindir@/traffic_manager $TM_DAEMON_ARGS
+Restart=on-failure
+RestartSec=5s
+ExecStopPost=/bin/sh -c ' \
+        export TM_PIDFILE=$(@exp_bindir@/traffic_layout} 2>/dev/null | grep RUNTIMEDIR | cut -d: -f2)/manager.lock ; \
+        /bin/rm -f $TM_PIDFILE ; \
+        if [[ $? -ne 0 ]]; then echo "ERROR: Unable to delete PID"; exit 1; fi'
+TimeoutStopSec=5s
 ExecReload=@exp_bindir@/traffic_ctl config reload
+KillMode=process
 
 [Install]
 WantedBy=multi-user.target