Handle relative pid folder correctly in the launch script
Previously, a relative PID folder was not handled correctly when running stop, status, or force_reload. This meant that a service could be started when configured to use a relative pid file, but then could not be stopped. The PID folder should be treated as relative to the service's jar file. This commit updates stop, status, and force_reload to push the jar file's directory so that this is now the case for those three commands. Closes gh-7092
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
source ./test-functions.sh
|
||||
echo 'JAVA_OPTS="-Dserver.port=8081 -Dserver.context-path=/test"' > /spring-boot-app.conf
|
||||
install_service
|
||||
echo 'JAVA_OPTS="-Dserver.port=8081 -Dserver.context-path=/test"' > /test-service/spring-boot-app.conf
|
||||
start_service
|
||||
await_app http://127.0.0.1:8081/test/
|
||||
curl -s http://127.0.0.1:8081/test/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
source ./test-functions.sh
|
||||
echo 'RUN_ARGS="--server.port=8081 --server.context-path=/test"' > /spring-boot-app.conf
|
||||
install_service
|
||||
echo 'RUN_ARGS="--server.port=8081 --server.context-path=/test"' > /test-service/spring-boot-app.conf
|
||||
start_service
|
||||
await_app http://127.0.0.1:8081/test/
|
||||
curl -s http://127.0.0.1:8081/test/
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
source ./test-functions.sh
|
||||
mkdir ./pid
|
||||
install_service
|
||||
echo 'PID_FOLDER=./pid' > /test-service/spring-boot-app.conf
|
||||
start_service
|
||||
echo "PID: $(cat /test-service/pid/spring-boot-app/spring-boot-app.pid)"
|
||||
await_app
|
||||
curl -s http://127.0.0.1:8080/
|
||||
status_service
|
||||
stop_service
|
||||
@@ -1,6 +1,6 @@
|
||||
source ./test-functions.sh
|
||||
echo 'JAVA_OPTS=-Dserver.port=8081' > /spring-boot-app.conf
|
||||
install_service
|
||||
echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf
|
||||
start_service
|
||||
await_app http://127.0.0.1:8081/
|
||||
curl -s http://127.0.0.1:8081/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
source ./test-functions.sh
|
||||
echo 'RUN_ARGS=--server.port=8081' > /spring-boot-app.conf
|
||||
install_service
|
||||
echo 'RUN_ARGS=--server.port=8081' > /test-service/spring-boot-app.conf
|
||||
start_service
|
||||
await_app http://127.0.0.1:8081/
|
||||
curl -s http://127.0.0.1:8081/
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
source ./test-functions.sh
|
||||
chmod -x $(type -p start-stop-daemon)
|
||||
echo 'USE_START_STOP_DAEMON=false' > /spring-boot-app.conf
|
||||
install_service
|
||||
echo 'USE_START_STOP_DAEMON=false' > /test-service/spring-boot-app.conf
|
||||
start_service
|
||||
await_app
|
||||
curl -s http://127.0.0.1:8080/
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
install_service() {
|
||||
mv /spring-boot-launch-script-tests-*.jar /spring-boot-app.jar
|
||||
chmod +x /spring-boot-app.jar
|
||||
ln -s /spring-boot-app.jar /etc/init.d/spring-boot-app
|
||||
mkdir /test-service
|
||||
mv /spring-boot-launch-script-tests-*.jar /test-service/spring-boot-app.jar
|
||||
chmod +x /test-service/spring-boot-app.jar
|
||||
ln -s /test-service/spring-boot-app.jar /etc/init.d/spring-boot-app
|
||||
}
|
||||
|
||||
start_service() {
|
||||
|
||||
Reference in New Issue
Block a user