From 75cb5453619f4561af939c84d57d38f0c7419edf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 4 Jan 2017 16:42:33 +0000 Subject: [PATCH] Update launch.script to use a consistent location for pid file Closes gh-6924 --- .../org/springframework/boot/loader/tools/launch.script | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script index fe8c4da9519..85c9d1784a5 100755 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script @@ -112,10 +112,7 @@ if [[ "$MODE" == "auto" && -n "$init_script" ]] || [[ "$MODE" == "service" ]]; t fi # Build the pid and log filenames -if [[ "$identity" == "$init_script" ]] || [[ "$identity" == "$APP_NAME" ]]; then - PID_FOLDER="$PID_FOLDER/${identity}" - pid_subfolder=$PID_FOLDER -fi +PID_FOLDER="$PID_FOLDER/${identity}" pid_file="$PID_FOLDER/{{pidFilename:${identity}.pid}}" log_file="$LOG_FOLDER/$LOG_FILENAME" @@ -152,9 +149,7 @@ do_start() { mkdir -p "$PID_FOLDER" &> /dev/null if [[ -n "$run_user" ]]; then checkPermissions || return $? - if [[ -z "$pid_subfolder" ]]; then - chown "$run_user" "$pid_subfolder" - fi + chown "$run_user" "$PID_FOLDER" chown "$run_user" "$pid_file" chown "$run_user" "$log_file" if [ $USE_START_STOP_DAEMON = true ] && type start-stop-daemon > /dev/null 2>&1; then