From 3aea1e1efabaef3b822eac846428b7f660a0983b Mon Sep 17 00:00:00 2001
From: Abhinavpv28 <162570454+Abhinavpv28@users.noreply.github.com>
Date: Sat, 16 May 2026 00:21:37 +0530
Subject: [PATCH] RDKEMW-18510: [develop]Log upload success logs not observed
 after scheduled reboot (#127)

* Update strategies.c

* Update strategies.c

* Update strategies.c

* Update uploadstblogs.c

* Update uploadstblogs.c

* Update strategies.c

* Update strategies.c

* Update strategies.c

* Update strategies.c

* Update strategies.c

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 uploadstblogs/src/strategies.c    | 18 ++++++------------
 uploadstblogs/src/uploadstblogs.c |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/uploadstblogs/src/strategies.c b/uploadstblogs/src/strategies.c
index ce880373a..18cce20f0 100644
--- a/uploadstblogs/src/strategies.c
+++ b/uploadstblogs/src/strategies.c
@@ -850,13 +850,7 @@ static int reboot_upload(RuntimeContext* ctx, SessionState* session)
                 "[%s:%d] Non-DCM mode (dcm_flag=0), will always upload logs\n", 
                 __FUNCTION__, __LINE__);
     }
-    // DCM mode (DCM_FLAG=1): Check upload_on_reboot flag
-    else if (ctx->upload_on_reboot) {
-        should_upload = true;
-        RDK_LOG(RDK_LOG_INFO, LOG_UPLOADSTB, 
-                "[%s:%d] DCM mode: Upload enabled from settings (upload_on_reboot=true)\n", 
-                __FUNCTION__, __LINE__);
-    } else {
+    else {
         // Check reboot reason file for scheduled reboot (grep -i "Scheduled Reboot\|MAINTENANCE_REBOOT")
         bool is_scheduled_reboot = false;
         FILE* reboot_file = fopen(reboot_info_path, "r");
@@ -887,12 +881,12 @@ static int reboot_upload(RuntimeContext* ctx, SessionState* session)
         
         RDK_LOG(RDK_LOG_INFO, LOG_UPLOADSTB, "[%s:%d] uploadLog:%s and UploadLogsOnUnscheduledReboot.Disable RFC: %s\n", __FUNCTION__, __LINE__, ctx->upload_on_reboot ? "true" : "false", disable_unscheduled_upload ? "true" : "false");
         
-        // Upload if: reboot reason is empty (unscheduled) AND RFC doesn't disable it
-        // Script logic: [ -z "$reboot_reason" -a "$DISABLE_UPLOAD_LOGS_UNSHEDULED_REBOOT" == "false" ]
-        if (!is_scheduled_reboot && !disable_unscheduled_upload) {
+        // Upload if upload_on_reboot is enabled, OR if the reboot is unscheduled
+        // and the UploadLogsOnUnscheduledReboot.Disable RFC does not disable it.
+        // Script logic for the unscheduled reboot path:
+        // [ -z "$reboot_reason" -a "$DISABLE_UPLOAD_LOGS_UNSHEDULED_REBOOT" == "false" ]
+        if ( ctx->upload_on_reboot==1 || (!is_scheduled_reboot && !disable_unscheduled_upload)) {
             should_upload = true;
-            RDK_LOG(RDK_LOG_INFO, LOG_UPLOADSTB, 
-                    "[%s:%d] Unscheduled reboot and RFC allows upload\n", __FUNCTION__, __LINE__);
         }
     }
     
diff --git a/uploadstblogs/src/uploadstblogs.c b/uploadstblogs/src/uploadstblogs.c
index 411db6315..7f29b2eb5 100755
--- a/uploadstblogs/src/uploadstblogs.c
+++ b/uploadstblogs/src/uploadstblogs.c
@@ -127,7 +127,7 @@ bool parse_args(int argc, char** argv, RuntimeContext* ctx)
     
     if (argc >= 5 && argv[4]) {
         // Parse UploadOnReboot
-        ctx->upload_on_reboot = (strcmp(argv[4], "true") == 0) ? 1 : 0;
+        ctx->upload_on_reboot = (strcmp(argv[4], "true") == 0 || strcmp(argv[4], "1") == 0) ? 1 : 0;
         fprintf(stderr, "DEBUG: UploadOnReboot (argv[4]) = '%s' -> %d\n", argv[4], ctx->upload_on_reboot);
     }