diff options
| -rw-r--r-- | server/pom.xml | 4 | ||||
| -rw-r--r-- | server/src/main/resources/application.properties | 7 | ||||
| -rw-r--r-- | standalone/src/main/assembly/bin/stop.sh | 27 | ||||
| -rw-r--r-- | standalone/src/main/assembly/bin/stop.sh.bak | 48 |
4 files changed, 70 insertions, 16 deletions
diff --git a/server/pom.xml b/server/pom.xml index deb0c0a2..fe8b8ce9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -57,6 +57,10 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-jpa</artifactId> </dependency> <dependency> diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 02843089..e97b3786 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -34,4 +34,9 @@ spring.jpa.properties.hibernate.format_sql=false ## Logback Properties logging.file=logs/usecaseui_server.log -logging.level.*=ERROR
\ No newline at end of file +logging.level.*=ERROR + +#enable shutdown +endpoints.shutdown.enabled=true +endpoints.shutdown.sensitive=false +management.context-path=/usecase-ui-server diff --git a/standalone/src/main/assembly/bin/stop.sh b/standalone/src/main/assembly/bin/stop.sh index cacd1186..2f60715a 100644 --- a/standalone/src/main/assembly/bin/stop.sh +++ b/standalone/src/main/assembly/bin/stop.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016-2017 ZTE Corporation. +# Copyright 2018 CMCC Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,22 +27,19 @@ cd $HOME; pwd echo @WORK_DIR@ $HOME -function save_service_pid(){ - service_pid=`ps -ef | grep $Main_Class | grep -v grep | awk '{print $2}'` - echo @service_pid@ $service_pid +function shutdown_usecaseui_server(){ + echo ================== usecase-ui server shutdown is starting ============================================= + curl -X POST http://localhost:8082/usecase-ui-server/shutdown + echo ================== usecase-ui server shutdown finished ============================================= } -function kill_service_process(){ - ps -p $service_pid - if [ $? == 0 ]; then - kill -9 $service_pid - fi +function shutdown_usecaseui_db(){ + echo ================== usecase-ui database shutdown is starting ============================================= + service mysql stop + echo ================== usecase-ui database shutdown finished ============================================= } -save_service_pid; -echo @C_CMD@ kill -9 $service_pid -kill_service_process; - -echo "Stoping mysql" -service mysql stop +shutdown_usecaseui_server; +shutdown_usecaseui_db; +echo "*****************usecase server shutdown finished*****************" sleep 1 diff --git a/standalone/src/main/assembly/bin/stop.sh.bak b/standalone/src/main/assembly/bin/stop.sh.bak new file mode 100644 index 00000000..cacd1186 --- /dev/null +++ b/standalone/src/main/assembly/bin/stop.sh.bak @@ -0,0 +1,48 @@ +#!/bin/bash +# +# Copyright 2016-2017 ZTE Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +DIRNAME=`dirname $0` +HOME=`cd $DIRNAME/; pwd` +Main_Class="usecase-ui-server" + +echo ================== usecase-ui-server info ============================================= +echo HOME=$HOME +echo Main_Class=$Main_Class +echo =============================================================================== +cd $HOME; pwd + +echo @WORK_DIR@ $HOME + +function save_service_pid(){ + service_pid=`ps -ef | grep $Main_Class | grep -v grep | awk '{print $2}'` + echo @service_pid@ $service_pid +} + +function kill_service_process(){ + ps -p $service_pid + if [ $? == 0 ]; then + kill -9 $service_pid + fi +} + +save_service_pid; +echo @C_CMD@ kill -9 $service_pid +kill_service_process; + +echo "Stoping mysql" +service mysql stop +sleep 1 |