github
/
ha-core
mirror of https://github.com/home-assistant/core
1
Fork 0
Code Releases Activity

Fix logging & exit code reporting to S6 on HA shutdown (#72921)

This commit is contained in:
nojocodex 2022-06-02 19:49:08 +02:00 committed by GitHub
parent 8c50c7fbd4
commit 8e4321af59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rootfs/etc/services.d/home-assistant/finish
View File

@ -2,24 +2,24 @@
# ============================================================================== # ==============================================================================
# Take down the S6 supervision tree when Home Assistant fails # Take down the S6 supervision tree when Home Assistant fails
# ============================================================================== # ==============================================================================
declare RESTART_EXIT_CODE 100 declare RESTART_EXIT_CODE=100
declare SIGNAL_EXIT_CODE 256 declare SIGNAL_EXIT_CODE=256
declare SIGTERM 15 declare SIGTERM=15
declare APP_EXIT_CODE=${1} declare APP_EXIT_CODE=${1}
declare SYS_EXIT_CODE=${2+x} declare SIGNAL_NO=${2}
declare NEW_EXIT_CODE= declare NEW_EXIT_CODE=
bashio::log.info "Home Assistant Core finish process exit code ${1}" bashio::log.info "Home Assistant Core finish process exit code ${APP_EXIT_CODE}"
if [[ ${APP_EXIT_CODE} -eq ${RESTART_EXIT_CODE} ]]; then if [[ ${APP_EXIT_CODE} -eq ${RESTART_EXIT_CODE} ]]; then
exit 0 exit 0
elif [[ ${APP_EXIT_CODE} -eq ${SIGNAL_EXIT_CODE} ]]; then elif [[ ${APP_EXIT_CODE} -eq ${SIGNAL_EXIT_CODE} ]]; then
bashio::log.info "Home Assistant Core finish process received signal ${APP_EXIT_CODE}" bashio::log.info "Home Assistant Core finish process received signal ${SIGNAL_NO}"
NEW_EXIT_CODE=$((128 + SYS_EXIT_CODE)) NEW_EXIT_CODE=$((128 + SIGNAL_NO))
echo ${NEW_EXIT_CODE} > /run/s6-linux-init-container-results/exitcode echo ${NEW_EXIT_CODE} > /run/s6-linux-init-container-results/exitcode
if [[ ${NEW_EXIT_CODE} -eq ${SIGTERM} ]]; then if [[ ${SIGNAL_NO} -eq ${SIGTERM} ]]; then
/run/s6/basedir/bin/halt /run/s6/basedir/bin/halt
fi fi
else else