update comment

This commit is contained in:
Teddysun 2016-09-17 12:37:11 +09:00
parent 78ff192e1c
commit 845357f546
6 changed files with 72 additions and 80 deletions

View File

@ -19,8 +19,9 @@ if [ -f /usr/bin/ssserver ]; then
elif [ -f /usr/local/bin/ssserver ]; then elif [ -f /usr/local/bin/ssserver ]; then
BIN=/usr/local/bin/ssserver BIN=/usr/local/bin/ssserver
fi fi
NAME=shadowsocks NAME=Shadowsocks
CONF=/etc/shadowsocks.json CONF=/etc/shadowsocks.json
RETVAL=0
check_running(){ check_running(){
PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'` PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@ -34,16 +35,15 @@ check_running(){
do_start(){ do_start(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is already running with PID $PID" echo "$NAME (pid $PID) is already running..."
RETVAL=1 exit 0
else else
$BIN -c $CONF -d start $BIN -c $CONF -d start
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME start success" echo "Starting $NAME success"
else else
echo "$NAME start failed" echo "Starting $NAME failed"
RETVAL=1
fi fi
fi fi
} }
@ -54,13 +54,12 @@ do_stop(){
$BIN -c $CONF -d stop $BIN -c $CONF -d stop
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME stop success" echo "Stopping $NAME success"
else else
echo "$NAME stop failed" echo "Stopping $NAME failed"
RETVAL=1
fi fi
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }
@ -68,10 +67,9 @@ do_stop(){
do_status(){ do_status(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is running with PID $PID" echo "$NAME (pid $PID) is running..."
RETVAL=0
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }

View File

@ -17,8 +17,9 @@ if [ -f /usr/bin/ssserver ]; then
elif [ -f /usr/local/bin/ssserver ]; then elif [ -f /usr/local/bin/ssserver ]; then
BIN=/usr/local/bin/ssserver BIN=/usr/local/bin/ssserver
fi fi
NAME=shadowsocks NAME=Shadowsocks
CONF=/etc/shadowsocks.json CONF=/etc/shadowsocks.json
RETVAL=0
check_running(){ check_running(){
PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'` PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@ -32,16 +33,15 @@ check_running(){
do_start(){ do_start(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is already running with PID $PID" echo "$NAME (pid $PID) is already running..."
RETVAL=1 exit 0
else else
$BIN -c $CONF -d start $BIN -c $CONF -d start
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME start success" echo "Starting $NAME success"
else else
echo "$NAME start failed" echo "Starting $NAME failed"
RETVAL=1
fi fi
fi fi
} }
@ -52,13 +52,12 @@ do_stop(){
$BIN -c $CONF -d stop $BIN -c $CONF -d stop
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME stop success" echo "Stopping $NAME success"
else else
echo "$NAME stop failed" echo "Stopping $NAME failed"
RETVAL=1
fi fi
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }
@ -66,10 +65,9 @@ do_stop(){
do_status(){ do_status(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is running with PID $PID" echo "$NAME (pid $PID) is running..."
RETVAL=0
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }

View File

@ -29,11 +29,11 @@ RET_VAL=0
[ -x $BIN ] || exit 0 [ -x $BIN ] || exit 0
if [[ ! -d $PID_DIR ]]; then if [ ! -d $PID_DIR ]; then
mkdir -p $PID_DIR mkdir -p $PID_DIR
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Creating PID directory $PID_DIR failed" echo "Creating PID directory $PID_DIR failed"
RET_VAL=1 exit 1
fi fi
fi fi
@ -43,9 +43,9 @@ if [ ! -f $CONF ]; then
fi fi
check_running() { check_running() {
if [[ -r $PID_FILE ]]; then if [ -r $PID_FILE ]; then
read PID < $PID_FILE read PID < $PID_FILE
if [[ -d "/proc/$PID" ]]; then if [ -d "/proc/$PID" ]; then
return 0 return 0
else else
rm -f $PID_FILE rm -f $PID_FILE
@ -60,10 +60,10 @@ do_status() {
check_running check_running
case $? in case $? in
0) 0)
echo "$NAME is running with PID $PID" echo "$NAME (pid $PID) is running..."
;; ;;
1|2) 1|2)
echo "$NAME is not running" echo "$NAME is stopped"
RET_VAL=1 RET_VAL=1
;; ;;
esac esac
@ -71,7 +71,7 @@ do_status() {
do_start() { do_start() {
if check_running; then if check_running; then
echo "$NAME is already running with PID $PID" echo "$NAME (pid $PID) is already running..."
return 0 return 0
fi fi
$BIN -c $CONF 2>&1 > /dev/null & $BIN -c $CONF 2>&1 > /dev/null &
@ -79,9 +79,9 @@ do_start() {
echo $PID > $PID_FILE echo $PID > $PID_FILE
sleep 0.3 sleep 0.3
if check_running; then if check_running; then
echo "$NAME start success" echo "Starting $NAME success"
else else
echo "$NAME start failed" echo "Starting $NAME failed"
RET_VAL=1 RET_VAL=1
fi fi
} }
@ -90,9 +90,9 @@ do_stop() {
if check_running; then if check_running; then
kill -9 $PID kill -9 $PID
rm -f $PID_FILE rm -f $PID_FILE
echo "$NAME stop success" echo "Stopping $NAME success"
else else
echo "$NAME is not running" echo "$NAME is stopped"
RET_VAL=1 RET_VAL=1
fi fi
} }

View File

@ -21,11 +21,11 @@ RET_VAL=0
[ -x $BIN ] || exit 0 [ -x $BIN ] || exit 0
if [[ ! -d $PID_DIR ]]; then if [ ! -d $PID_DIR ]; then
mkdir -p $PID_DIR mkdir -p $PID_DIR
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Creating PID directory $PID_DIR failed" echo "Creating PID directory $PID_DIR failed"
RET_VAL=1 exit 1
fi fi
fi fi
@ -35,9 +35,9 @@ if [ ! -f $CONF ]; then
fi fi
check_running() { check_running() {
if [[ -r $PID_FILE ]]; then if [ -r $PID_FILE ]; then
read PID < $PID_FILE read PID < $PID_FILE
if [[ -d "/proc/$PID" ]]; then if [ -d "/proc/$PID" ]; then
return 0 return 0
else else
rm -f $PID_FILE rm -f $PID_FILE
@ -52,10 +52,10 @@ do_status() {
check_running check_running
case $? in case $? in
0) 0)
echo "$NAME is running with PID $PID" echo "$NAME (pid $PID) is running..."
;; ;;
1|2) 1|2)
echo "$NAME is not running" echo "$NAME is stopped"
RET_VAL=1 RET_VAL=1
;; ;;
esac esac
@ -63,7 +63,7 @@ do_status() {
do_start() { do_start() {
if check_running; then if check_running; then
echo "$NAME is already running with PID $PID" echo "$NAME (pid $PID) is already running..."
return 0 return 0
fi fi
$BIN -c $CONF 2>&1 > /dev/null & $BIN -c $CONF 2>&1 > /dev/null &
@ -71,9 +71,9 @@ do_start() {
echo $PID > $PID_FILE echo $PID > $PID_FILE
sleep 0.3 sleep 0.3
if check_running; then if check_running; then
echo "$NAME start success" echo "Starting $NAME success"
else else
echo "$NAME start failed" echo "Starting $NAME failed"
RET_VAL=1 RET_VAL=1
fi fi
} }
@ -82,9 +82,9 @@ do_stop() {
if check_running; then if check_running; then
kill -9 $PID kill -9 $PID
rm -f $PID_FILE rm -f $PID_FILE
echo "$NAME stop success" echo "Stopping $NAME success"
else else
echo "$NAME is not running" echo "$NAME is stopped"
RET_VAL=1 RET_VAL=1
fi fi
} }

View File

@ -17,6 +17,7 @@
NAME=ShadowsocksR NAME=ShadowsocksR
BIN=/usr/local/shadowsocks/server.py BIN=/usr/local/shadowsocks/server.py
CONF=/etc/shadowsocks.json CONF=/etc/shadowsocks.json
RETVAL=0
check_running(){ check_running(){
PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'` PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@ -30,16 +31,15 @@ check_running(){
do_start(){ do_start(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is already running with PID $PID" echo "$NAME (pid $PID) is already running..."
RETVAL=1 exit 0
else else
$BIN -c $CONF -d start $BIN -c $CONF -d start
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME start success" echo "Starting $NAME success"
else else
echo "$NAME start failed" echo "Starting $NAME failed"
RETVAL=1
fi fi
fi fi
} }
@ -50,13 +50,12 @@ do_stop(){
$BIN -c $CONF -d stop $BIN -c $CONF -d stop
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME stop success" echo "Stopping $NAME success"
else else
echo "$NAME stop failed" echo "Stopping $NAME failed"
RETVAL=1
fi fi
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }
@ -64,10 +63,9 @@ do_stop(){
do_status(){ do_status(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is running with PID $PID" echo "$NAME (pid $PID) is running..."
RETVAL=0
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }

View File

@ -15,6 +15,7 @@
NAME=ShadowsocksR NAME=ShadowsocksR
BIN=/usr/local/shadowsocks/server.py BIN=/usr/local/shadowsocks/server.py
CONF=/etc/shadowsocks.json CONF=/etc/shadowsocks.json
RETVAL=0
check_running(){ check_running(){
PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'` PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@ -28,16 +29,15 @@ check_running(){
do_start(){ do_start(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is already running with PID $PID" echo "$NAME (pid $PID) is already running..."
RETVAL=1 exit 0
else else
$BIN -c $CONF -d start $BIN -c $CONF -d start
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME start success" echo "Starting $NAME success"
else else
echo "$NAME start failed" echo "Starting $NAME failed"
RETVAL=1
fi fi
fi fi
} }
@ -48,13 +48,12 @@ do_stop(){
$BIN -c $CONF -d stop $BIN -c $CONF -d stop
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "$NAME stop success" echo "Stopping $NAME success"
else else
echo "$NAME stop failed" echo "Stopping $NAME failed"
RETVAL=1
fi fi
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }
@ -62,10 +61,9 @@ do_stop(){
do_status(){ do_status(){
check_running check_running
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$NAME is running with PID $PID" echo "$NAME (pid $PID) is running..."
RETVAL=0
else else
echo "$NAME is not running" echo "$NAME is stopped"
RETVAL=1 RETVAL=1
fi fi
} }