Merge pull request #15 from fankux/master

remaster run script

script/run.sh

 #!/usr/bin/env bash
 
-BIN='logproxy'
+cd $(dirname $0)
+DEPLOY_PATH=$(pwd)
+echo "DEPLOY_PATH : "${DEPLOY_PATH}
 
+BIN='logproxy'
 GPID=0
-function is_running()
-{
-    DEPLOY_PATH=$1
-    PROC_BIN_NAME=$2
-    for pid in `ps ux | grep ${PROC_BIN_NAME} | awk '{print $2}'`; do
+function is_running() {
+  for pid in $(ps ux | grep ${BIN} | grep -v 'bash ' | grep -v grep | awk '{print $2}'); do
     _path=$(readlink -f /proc/${pid}/cwd)
-        if [[ ${?} -eq 0 ]] && [[ ${_path} = ${DEPLOY_PATH} ]]; then
+    if [[ ${?} -eq 0 ]] && [[ ${_path} == ${DEPLOY_PATH} ]]; then
       GPID=${pid}
-            echo "is_running : (${GPID})${DEPLOY_PATH} ${PROC_BIN_NAME} is running!"
+      echo "is_running : (${GPID})${DEPLOY_PATH} ${BIN} is running!"
       return 1
     fi
   done
   return 0
 }
 
-function kill_proc_9()
-{
-    DEPLOY_PATH=$1
-    PROC_BIN_NAME=$2
-    force=$3
+function kill_proc_9() {
+  force=$1
 
-    [[ ! -d ${DEPLOY_PATH} ]] && {
-        echo "@@@@@@@@@@@@@@@ kill_proc : ${DEPLOY_PATH} invalid!"
+  if [[ ! -d ${DEPLOY_PATH} ]]; then
+    echo "kill_proc : ${DEPLOY_PATH} invalid!"
     return 0
-    }
+  fi
 
   retry=0
-    is_running ${DEPLOY_PATH} ${PROC_BIN_NAME}
+  is_running
   status=$?
   while [[ ${status} -eq 1 ]]; do
     if [ ! -z ${force} ]; then
@@ -41,19 +38,18 @@ function kill_proc_9()
       echo "kill_proc : (${GPID})${DEPLOY_PATH} succ!"
     fi
     sleep 1
-        retry=`expr ${retry} + 1`
+    retry=$(expr ${retry} + 1)
     if [ ${retry} -gt 15 ]; then
       force=1
     fi
-        is_running ${DEPLOY_PATH} ${PROC_BIN_NAME}
+    is_running
     status=$?
   done
 
   return 0
 }
 
-start()
-{
+start() {
   stop
 
   if [ ! -d "./run" ]; then
@@ -64,23 +60,18 @@ start()
   if [ ! -d ${log_path} ]; then
     mkdir ${log_path}
   fi
-    log_path=`readlink -f ${log_path}`
+  log_path=$(readlink -f ${log_path})
 
-    chmod u+x ./bin/${BIN} && ./bin/${BIN} -f ./conf/conf.json &> ${log_path}/out.log&
+  chmod u+x ./bin/${BIN} && ./bin/${BIN} -f ./conf/conf.json &>${log_path}/out.log &
   if [ $? -ne 0 ]; then
     exit -1
   fi
 
-    is_running ${deploy_path} ${BIN}
+  is_running
 }
 
-stop()
-{
-    cd `dirname $0`
-    echo "work path : "`pwd`
-    deploy_path=`pwd`
-
-    kill_proc_9 ${deploy_path} ${BIN}
+stop() {
+  kill_proc_9
 }
 
 case C"$1" in
@@ -97,11 +88,7 @@ Cdebug)
   echo "${BIN} started!"
   ;;
 Cstatus)
-    cd `dirname $0`
-    echo "work path : "`pwd`
-    deploy_path=`pwd`
-
-    is_running ${deploy_path} ${BIN}
+  is_running
   status=$?
   echo "status : ${status}"
   exit ${status}