Merge pull request #4 from polarismesh/main

merge versions
polarismesh · Sep 14, 2021 · 0fbd2a9 · 0fbd2a9
2 parents 4634e69 + ccbbf37
commit 0fbd2a9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ web/node_modules
 web/dist
 .idea
 department.txt
+./log/
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ web/node_modules @@
     web/dist
     .idea
     department.txt
+    ./log/