GerhardHoffmann/UpdateController
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added FATAL_FAILURE to log_helpers. Do not send to APIS in case of FATAL_FAILURE.

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-05-24 16:46:21 +02:00
parent 17521771e3
commit 2a8be547a8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log_helpers
View File

@ -18,6 +18,7 @@ if [ "${log_helpers_sourced:-1}" = "1" ]; then # include only once
readonly MAX_DEBUG_LEVEL=6 readonly MAX_DEBUG_LEVEL=6
log_level=$INFO log_level=$INFO
FATAL_FAILURE=false
set_dbg_level () { set_dbg_level () {
if [ $1 < $MAX_DEBUG_LEVEL ]; then if [ $1 < $MAX_DEBUG_LEVEL ]; then
@ -83,6 +84,7 @@ if [ "${log_helpers_sourced:-1}" = "1" ]; then # include only once
if [ $log_level -le $FATAL ]; then if [ $log_level -le $FATAL ]; then
log "FATAL $*" log "FATAL $*"
log "exiting ..." log "exiting ..."
FATAL_FAILURE=true
exit 1 exit 1
fi fi
} }

12
update_psa_impl
View File

@ -13,6 +13,8 @@ trap collect_current_configuration EXIT
collect_current_configuration () { collect_current_configuration () {
local func="${FUNCNAME[0]}" local func="${FUNCNAME[0]}"
$FATAL_FAILURE && return 1
# TODO: eventuell muss die version neu berechnet werden # TODO: eventuell muss die version neu berechnet werden
current_settings_to_ismas current_settings_to_ismas
@ -28,15 +30,7 @@ collect_current_configuration () {
#done #done
} }
update_psa() { # calling with a parameter is used for testing update_psa() {
if [ $# -eq 0 ]; then
if ! updates_available; then # check for false alarm
update_psa_false_alarm "update requested, but no WAIT state detected"
exit $EXITCODE
fi
fi
update_psa_activated # message to ISMAS update_psa_activated # message to ISMAS
local func="${FUNCNAME[0]}" local func="${FUNCNAME[0]}"