Add critical log where upgrade status is changing

Change-Id: Ib6030b3236750d538149fe69c7f032c300da5668
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
(cherry picked from commit fbb4ba4cfe3b5376f8be5462a745b4445fcb6b8d)

diff --git a/upgrade/rw-update-macro.inc b/upgrade/rw-update-macro.inc
index 3ad1365360127cb3e7712e912654b15c05f8b25d..5ed8aea4ba18a6888472e330cafb566e474899fc 100644 (file)
--- a/upgrade/rw-update-macro.inc
+++ b/upgrade/rw-update-macro.inc
@@ -27,6 +27,16 @@ NOTIFY()
         echo -e "${COLOR_NOTIFY}${LOG_TEXT}${COLOR_RESET}"
 }
 
+CRITICAL_LOG()
+{
+       LOG="[$SCRIPT_NAME]$1"
+       dlogsend -k "$LOG"
+       if [ "$2" != "" ]; then
+               echo "$LOG" >> "$2"
+       fi
+       echo "$LOG"
+}
+
 # Convert version to 4 digits
 convert_version() {
        i=0

diff --git a/upgrade/update-finalize.sh.in b/upgrade/update-finalize.sh.in
index b7d08fcafe83276a1965cde73b6d160bcdbc7593..acb2a1421dc9c4ecca07bc66f8cfc8803f402057 100755 (executable)
--- a/upgrade/update-finalize.sh.in
+++ b/upgrade/update-finalize.sh.in
@@ -4,6 +4,29 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 RW_MACRO=@TZ_SYS_UPGRADE@/rw-update-macro.inc
 
+HAL_SET_UPGRADE_STATUS=/usr/bin/device_board_set_upgrade_status
+
+SCRIPT_NAME=$(basename $0)
+CRITICAL_LOG()
+{
+       LOG="[$SCRIPT_NAME]$1"
+       dlogsend -k "$LOG"
+       if [ "$2" != "" ]; then
+               echo "$LOG" >> "$2"
+       fi
+       echo "$LOG"
+}
+
+SET_UPGRADE_STATUS()
+{
+       ${HAL_SET_UPGRADE_STATUS} "$1"
+       if [ $? -eq 0 ]; then
+               CRITICAL_LOG "set_upgrade_status success: ${1}"
+       else
+               CRITICAL_LOG "set_upgrade_status failed: ${1}"
+       fi
+}
+
 if [ -f $RW_MACRO ];
 then
        source $RW_MACRO
@@ -20,7 +43,7 @@ if [ -z ${UPDATE_PREPARE_ERR+x} ] && [ "${UPDATE_SUCCESS}" == "1" ]; then
        COMMIT_CHANGES
        /usr/bin/device_board_clear_partition_ab_cloned
        /usr/bin/device_board_set_boot_success
-       /usr/bin/device_board_set_upgrade_status 100
+       SET_UPGRADE_STATUS 100
        reboot -f
 else
        reboot -f fota

diff --git a/upgrade/update.sh.in b/upgrade/update.sh.in
index 47a96d8ed7c24741dbc4763147657cbac8eaa5b6..662fe64f7563240ec7abb652dcec85fb966f60c4 100755 (executable)
--- a/upgrade/update.sh.in
+++ b/upgrade/update.sh.in
@@ -20,6 +20,8 @@ HAL_PROGRESS_MAX=99
 RW_MACRO=@TZ_SYS_UPGRADE@/rw-update-macro.inc
 RW_UPDATE_FLAG=/opt/.do_rw_update
 
+SCRIPT_NAME=$(basename $0)
+
 DEBUG()
 {
         LOG_TEXT=$1
@@ -38,6 +40,16 @@ NOTIFY()
         echo -e "${COLOR_NOTIFY}${LOG_TEXT}${COLOR_RESET}"
 }
 
+CRITICAL_LOG()
+{
+       LOG="[$SCRIPT_NAME]$1"
+       dlogsend -k "$LOG"
+       if [ "$2" != "" ]; then
+               echo "$LOG" >> "$2"
+       fi
+       echo "$LOG"
+}
+
 PROGRESS_DIR=/tmp/upgrade
 PROGRESS_INIT()
 {
@@ -74,6 +86,11 @@ SET_UPDATE_RESULT()
 SET_UPGRADE_STATUS()
 {
        ${HAL_SET_UPGRADE_STATUS} "$1"
+       if [ $? -eq 0 ]; then
+               CRITICAL_LOG "set_upgrade_status success: ${1}"
+       else
+               CRITICAL_LOG "set_upgrade_status failed: ${1}"
+       fi
 }
 
 if [[ $(</proc/cmdline) =~ partition_ab= ]] && [ ! -f ${RW_UPDATE_FLAG} ]