upgrade-2.x: avoid log function blocking execution

Appending to /dev/stderr can cause the script to block if the device is not available. Also, always include the script name in the logs. Change-type: patch Signed-off-by: Alex Gonzalez <[email protected]>
balena-os · Apr 26, 2024 · 046fd01 · 046fd01
1 parent 2ce06a4
commit 046fd01
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/upgrade-2.x.sh b/upgrade-2.x.sh
@@ -159,13 +159,11 @@ function log {
             loglevel=INFO
             ;;
     esac
-    echo "${1}" | systemd-cat --level-prefix=0 --identifier="$(basename "$0")" --priority="${priority}" 2> /dev/null || true
+    echo "${1}" | systemd-cat --level-prefix=0 --identifier="${SCRIPTNAME}" --priority="${priority}" 2> /dev/null || true
     endtime=$(date +%s)
+    printf "[%s][%09d%s%s\n" "$SCRIPTNAME" "$((endtime - starttime))" "][$loglevel]" "$1"
     if [ "$loglevel" == "ERROR" ]; then
-        printf "[%09d%s%s\n" "$((endtime - starttime))" "][$loglevel]" "$1" >> /dev/stderr
         exit 1
-    else
-        printf "[%09d%s%s\n" "$((endtime - starttime))" "][$loglevel]" "$1"
     fi
 }