From 0d9fb096b78363e57192853e4aa58060945218fd Mon Sep 17 00:00:00 2001 From: Georg Lauterbach <44545919+aendeavor@users.noreply.github.com> Date: Thu, 25 Feb 2021 10:57:20 +0100 Subject: [PATCH] adjusting _seup_supervisor to not restart when wrong log-level given --- target/scripts/startup/setup-stack.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/target/scripts/startup/setup-stack.sh b/target/scripts/startup/setup-stack.sh index e900d2ac..a90c3aa7 100644 --- a/target/scripts/startup/setup-stack.sh +++ b/target/scripts/startup/setup-stack.sh @@ -14,25 +14,27 @@ function _setup_supervisor if ! grep -q "loglevel = ${SUPERVISOR_LOGLEVEL}" /etc/supervisor/supervisord.conf then case "${SUPERVISOR_LOGLEVEL}" in - 'critical' | 'error' | 'warn' | 'info' | 'debug' ) + 'critical' | 'error' | 'info' | 'debug' ) sed -i -E \ - "s|loglevel.*|loglevel = ${SUPERVISOR_LOGLEVEL}|g" \ + "s|(loglevel).*|\1 = ${SUPERVISOR_LOGLEVEL}|g" \ /etc/supervisor/supervisord.conf + + supervisorctl reload + ;; + + 'warn' ) + return 0 ;; * ) _notify 'err' \ - "SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'" - - sed -i -E \ - 's|loglevel.*|loglevel = warn|g' \ - /etc/supervisor/supervisord.conf + "SUPERVISOR_LOGLEVEL '${SUPERVISOR_LOGLEVEL}' unknown. Using default 'warn'" ;; esac - - supervisorctl reload fi + + return 0 } function _setup_default_vars