Skip to content

Commit 3f894cb

Browse files
agebhar1wilkinsona
authored andcommitted
Log a warning when using fallback for pid and log locations
See gh-14519
1 parent 5d0e812 commit 3f894cb

File tree

1 file changed

+7
-7
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools

1 file changed

+7
-7
lines changed

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,18 @@ configfile="$(basename "${jarfile%.*}.conf")"
5757
# shellcheck source=/dev/null
5858
[[ -r "${CONF_FOLDER}/${configfile}" ]] && source "${CONF_FOLDER}/${configfile}"
5959

60+
# ANSI Colors
61+
echoRed() { echo $'\e[0;31m'"$1"$'\e[0m'; }
62+
echoGreen() { echo $'\e[0;32m'"$1"$'\e[0m'; }
63+
echoYellow() { echo $'\e[0;33m'"$1"$'\e[0m'; }
64+
6065
# Initialize PID/LOG locations if they weren't provided by the config file
6166
[[ -z "$PID_FOLDER" ]] && PID_FOLDER="{{pidFolder:/var/run}}"
6267
[[ -z "$LOG_FOLDER" ]] && LOG_FOLDER="{{logFolder:/var/log}}"
6368
! [[ "$PID_FOLDER" == /* ]] && PID_FOLDER="$(dirname "$jarfile")"/"$PID_FOLDER"
6469
! [[ "$LOG_FOLDER" == /* ]] && LOG_FOLDER="$(dirname "$jarfile")"/"$LOG_FOLDER"
65-
! [[ -x "$PID_FOLDER" ]] && PID_FOLDER="/tmp"
66-
! [[ -x "$LOG_FOLDER" ]] && LOG_FOLDER="/tmp"
70+
! [[ -x "$PID_FOLDER" ]] && echoYellow "Warning: PID_FOLDER=$PID_FOLDER does not exists fallback to /tmp" && PID_FOLDER="/tmp"
71+
! [[ -x "$LOG_FOLDER" ]] && echoYellow "Warning: LOG_FOLDER=$LOG_FOLDER does not exists fallback to /tmp" && LOG_FOLDER="/tmp"
6772

6873
# Set up defaults
6974
[[ -z "$MODE" ]] && MODE="{{mode:auto}}" # modes are "auto", "service" or "run"
@@ -84,11 +89,6 @@ fi
8489
# Initialize stop wait time if not provided by the config file
8590
[[ -z "$STOP_WAIT_TIME" ]] && STOP_WAIT_TIME="{{stopWaitTime:60}}"
8691

87-
# ANSI Colors
88-
echoRed() { echo $'\e[0;31m'"$1"$'\e[0m'; }
89-
echoGreen() { echo $'\e[0;32m'"$1"$'\e[0m'; }
90-
echoYellow() { echo $'\e[0;33m'"$1"$'\e[0m'; }
91-
9292
# Utility functions
9393
checkPermissions() {
9494
touch "$pid_file" &> /dev/null || { echoRed "Operation not permitted (cannot access pid file)"; return 4; }

0 commit comments

Comments
 (0)