diff --git a/main.sh b/main.sh index cd712fe..0600fbb 100644 --- a/main.sh +++ b/main.sh @@ -273,10 +273,8 @@ login(){ login_reboot(){ ip=${1} - ssh $ip "bash /usr/local/apache-tomcat-7.0.79/bin/shutdown.sh" - sleep 3 - ssh $ip "bash /usr/local/apache-tomcat-7.0.79/bin/startup.sh" - ssh $ip "jps -m" + ssh $ip "bash /usr/local/apache-tomcat-7.0.79/login_reboot.sh" + ssh $ip "ps -ef|grep tomcat" echo "登陆服重启完毕" } diff --git a/update_login.sh b/update_login.sh index 11fcff7..c285428 100644 --- a/update_login.sh +++ b/update_login.sh @@ -16,4 +16,5 @@ git pull if [ ! -z ${ip} ];then scp build/libs/loginserver-1.0-SNAPSHOT.war ${ip}:/usr/local/apache-tomcat-7.0.79/webapps/jl_loginserver.war + scp login_reboot.sh ${ip}:/usr/local/apache-tomcat-7.0.79/login_reboot.sh fi