diff --git a/.gitignore b/.gitignore index 8717d739..28dad67a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ web/node_modules web/dist .idea department.txt +./log/ \ No newline at end of file diff --git a/tool/check.sh b/tool/check.sh index 88a075f5..ff815d3b 100755 --- a/tool/check.sh +++ b/tool/check.sh @@ -14,7 +14,7 @@ workdir=$(pwd) #------------------------------------------------------ source tool/include -pids=$(ps -e -o pid,cmd | grep -w "$cmdline" | grep -v "grep" | awk '{print $1}') +pids=$(ps -ef | grep -w "$cmdline" | grep -v "grep" | awk '{print $2}') array=($pids) if [ "${#array[@]}" == "0" ]; then diff --git a/tool/include b/tool/include index b0f595bf..cf2c1102 100644 --- a/tool/include +++ b/tool/include @@ -35,7 +35,7 @@ function start() { } function stop() { - pids=$(ps -e -o pid,cmd | grep -w "$cmdline" | grep -v "grep" | awk '{print $1}') + pids=$(ps -ef | grep -w "$cmdline" | grep -v "grep" | awk '{print $2}') array=($pids) for pid in ${array[@]}; do log_info "stop $server_name: pid=$pid" diff --git a/tool/start.sh b/tool/start.sh index a2bc0fd1..c12a3d49 100755 --- a/tool/start.sh +++ b/tool/start.sh @@ -14,7 +14,7 @@ workdir=$(pwd) #------------------------------------------------------ source tool/include -pids=$(ps -e -o pid,cmd | grep -w "$cmdline" | grep -v "grep" | awk '{print $1}') +pids=$(ps -ef | grep -w "$cmdline" | grep -v "grep" | awk '{print $2}') array=($pids) if [ "${#array[@]}" == "0" ]; then start