From e7f4d234125f40b02c2f3dafee31869ffee03074 Mon Sep 17 00:00:00 2001 From: Carlos Gutierrez Date: Tue, 17 Mar 2015 20:30:25 -0700 Subject: [PATCH] Remove use of PID and fix stderr redirection --- scripts/init/centos/gogs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/init/centos/gogs b/scripts/init/centos/gogs index 90469498b..1a92ff207 100644 --- a/scripts/init/centos/gogs +++ b/scripts/init/centos/gogs @@ -28,7 +28,6 @@ GOGS_HOME=/home/git/gogs GOGS_PATH=${GOGS_HOME}/$NAME GOGS_USER=git SERVICENAME="Gogs Go Git Service" -PID=/var/run/$NAME.pid LOCKFILE=/var/lock/subsys/gogs LOGFILE=${GOGS_HOME}/log/gogs.log RETVAL=0 @@ -39,7 +38,7 @@ RETVAL=0 # Don't do anything if nothing is installed [ -x ${GOGS_PATH} ] || exit 0 -DAEMON_OPTS="" +DAEMON_OPTS="--check $NAME" # Set additional options, if any [ ! -z "$GOGS_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GOGS_USER}" @@ -47,8 +46,7 @@ DAEMON_OPTS="" start() { cd ${GOGS_HOME} echo -n "Starting ${SERVICENAME}: " - daemon $DAEMON_OPTS --pidfile=${PID} "${GOGS_PATH} web 2>&1 > ${LOGFILE} &" - echo $! > ${PID} + daemon $DAEMON_OPTS "${GOGS_PATH} web > ${LOGFILE} 2>&1 &" RETVAL=$? echo [ $RETVAL = 0 ] && touch ${LOCKFILE} @@ -59,10 +57,10 @@ start() { stop() { cd ${GOGS_HOME} echo -n "Shutting down ${SERVICENAME}: " - killproc -p ${PID} ${NAME} + killproc ${NAME} RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PID} + [ $RETVAL = 0 ] && rm -f ${LOCKFILE} } case "$1" in @@ -74,7 +72,7 @@ case "$1" in stop ;; status) - status -p ${PID} ${NAME} + status ${NAME} ;; restart) stop