优化安装脚本等待时间

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

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
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-
+n=0
-cd /www/server/mdserver-web && ./cli.sh stop
+while [[ ! -f /etc/init.d/mw ]];
-cd /www/server/mdserver-web && ./scripts/init.d/mw default
+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
+
+
+
 
 

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
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-
+n=0
-cd /www/server/mdserver-web && ./cli.sh stop
+while [[ ! -f /etc/init.d/mw ]];
-cd /www/server/mdserver-web && ./scripts/init.d/mw default
+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
+
+
 
 

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
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-
+n=0
-cd /www/server/mdserver-web && ./cli.sh stop
+while [[ ! -f /etc/init.d/mw ]];
-cd /www/server/mdserver-web && ./scripts/init.d/mw default
+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
+
+
+
 
 
 

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
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-
+n=0
-cd /www/server/mdserver-web && ./cli.sh stop
+while [[ ! -f /etc/init.d/mw ]];
-cd /www/server/mdserver-web && ./scripts/init.d/mw default
+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
 
 

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
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-
+n=0
-cd /www/server/mdserver-web && ./cli.sh stop
+while [[ ! -f /etc/init.d/mw ]];
-cd /www/server/mdserver-web && ./scripts/init.d/mw default
+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
 
 

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
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-
+n=0
-cd /www/server/mdserver-web && ./cli.sh stop
+while [[ ! -f /etc/init.d/mw ]];
-cd /www/server/mdserver-web && ./scripts/init.d/mw default
+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
+
+