From b167bae1980c85de208058ee9b830d2bd8186543 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 30 Jun 2022 22:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli.sh | 9 +++++++-- scripts/install/alma.sh | 22 ++++++++++++++++++---- scripts/install/centos.sh | 21 +++++++++++++++++---- scripts/install/debian.sh | 22 ++++++++++++++++++---- scripts/install/fedora.sh | 20 +++++++++++++++----- scripts/install/rocky.sh | 20 +++++++++++++++----- scripts/install/ubuntu.sh | 21 +++++++++++++++++---- 7 files changed, 107 insertions(+), 28 deletions(-) diff --git a/cli.sh b/cli.sh index abc5d49fc..f38e77abb 100755 --- a/cli.sh +++ b/cli.sh @@ -18,7 +18,6 @@ mw_start(){ mw_start_debug(){ - python3 task.py >> $DIR/logs/task.log 2>&1 & gunicorn -b :7200 -k gevent -w 1 app:app } @@ -36,7 +35,13 @@ mw_stop() do kill -9 $i done - ps -ef|grep task.py |grep -v grep|awk '{print $2}'|xargs kill -9 + + pids=`ps -ef|grep task.py | grep -v grep |awk '{print $2}'` + arr=($pids) + for p in ${arr[@]} + do + kill -9 $p + done } case "$1" in diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh index d7ddc4136..1e70f2e15 100755 --- a/scripts/install/alma.sh +++ b/scripts/install/alma.sh @@ -86,10 +86,24 @@ chmod 755 /www/server/mdserver-web/data cd /www/server/mdserver-web && ./cli.sh start -sleep 5 - -cd /www/server/mdserver-web && ./cli.sh stop -cd /www/server/mdserver-web && ./scripts/init.d/mw default +isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` +n=0 +while [[ ! -f /etc/init.d/mw ]]; +do + echo -e ".\c" + sleep 1 + let n+=1 + if [ $n -gt 20 ];then + echo -e "start mw fail" + exit 1 + fi +done + +cd /www/server/mdserver-web && /etc/init.d/mw stop cd /www/server/mdserver-web && /etc/init.d/mw start +cd /www/server/mdserver-web && /etc/init.d/mw default + + + diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index e2b548a1f..ffc3aa855 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -95,10 +95,23 @@ chmod 755 /www/server/mdserver-web/data cd /www/server/mdserver-web && ./cli.sh start -sleep 5 - -cd /www/server/mdserver-web && ./cli.sh stop -cd /www/server/mdserver-web && ./scripts/init.d/mw default +isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` +n=0 +while [[ ! -f /etc/init.d/mw ]]; +do + echo -e ".\c" + sleep 1 + let n+=1 + if [ $n -gt 20 ];then + echo -e "start mw fail" + exit 1 + fi +done + +cd /www/server/mdserver-web && /etc/init.d/mw stop cd /www/server/mdserver-web && /etc/init.d/mw start +cd /www/server/mdserver-web && /etc/init.d/mw default + + diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index 8d36831f4..ea3761dd6 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -104,11 +104,25 @@ chmod 755 /www/server/mdserver-web/data cd /www/server/mdserver-web && ./cli.sh start -sleep 5 - -cd /www/server/mdserver-web && ./cli.sh stop -cd /www/server/mdserver-web && ./scripts/init.d/mw default +isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` +n=0 +while [[ ! -f /etc/init.d/mw ]]; +do + echo -e ".\c" + sleep 1 + let n+=1 + if [ $n -gt 20 ];then + echo -e "start mw fail" + exit 1 + fi +done + +cd /www/server/mdserver-web && /etc/init.d/mw stop cd /www/server/mdserver-web && /etc/init.d/mw start +cd /www/server/mdserver-web && /etc/init.d/mw default + + + diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index feec8833d..fbba069c6 100644 --- a/scripts/install/fedora.sh +++ b/scripts/install/fedora.sh @@ -85,12 +85,22 @@ cd /www/server/mdserver-web/scripts && bash lib.sh chmod 755 /www/server/mdserver-web/data - cd /www/server/mdserver-web && ./cli.sh start -sleep 5 - -cd /www/server/mdserver-web && ./cli.sh stop -cd /www/server/mdserver-web && ./scripts/init.d/mw default +isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` +n=0 +while [[ ! -f /etc/init.d/mw ]]; +do + echo -e ".\c" + sleep 1 + let n+=1 + if [ $n -gt 20 ];then + echo -e "start mw fail" + exit 1 + fi +done + +cd /www/server/mdserver-web && /etc/init.d/mw stop cd /www/server/mdserver-web && /etc/init.d/mw start +cd /www/server/mdserver-web && /etc/init.d/mw default diff --git a/scripts/install/rocky.sh b/scripts/install/rocky.sh index 7d1b6c925..c4cbcf1b5 100644 --- a/scripts/install/rocky.sh +++ b/scripts/install/rocky.sh @@ -84,11 +84,21 @@ chmod 755 /www/server/mdserver-web/data cd /www/server/mdserver-web && ./cli.sh start -sleep 5 - -cd /www/server/mdserver-web && ./cli.sh stop -cd /www/server/mdserver-web && ./scripts/init.d/mw default +isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` +n=0 +while [[ ! -f /etc/init.d/mw ]]; +do + echo -e ".\c" + sleep 1 + let n+=1 + if [ $n -gt 20 ];then + echo -e "start mw fail" + exit 1 + fi +done + +cd /www/server/mdserver-web && /etc/init.d/mw stop cd /www/server/mdserver-web && /etc/init.d/mw start - +cd /www/server/mdserver-web && /etc/init.d/mw default diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index 152c0bb4f..0e143a4cf 100644 --- a/scripts/install/ubuntu.sh +++ b/scripts/install/ubuntu.sh @@ -66,9 +66,22 @@ chmod 755 /www/server/mdserver-web/data cd /www/server/mdserver-web && ./cli.sh start -sleep 5 - -cd /www/server/mdserver-web && ./cli.sh stop -cd /www/server/mdserver-web && ./scripts/init.d/mw default +isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` +n=0 +while [[ ! -f /etc/init.d/mw ]]; +do + echo -e ".\c" + sleep 1 + let n+=1 + if [ $n -gt 20 ];then + echo -e "start mw fail" + exit 1 + fi +done + +cd /www/server/mdserver-web && /etc/init.d/mw stop cd /www/server/mdserver-web && /etc/init.d/mw start +cd /www/server/mdserver-web && /etc/init.d/mw default + +