diff --git a/CHANGELOG.md b/CHANGELOG.md index 4539b3cc..0611d33b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [4.2.2](https://github.com/rdkcentral/sysint/compare/4.2.1...4.2.2) + +- RDK-57502 - [RDKE] Migrate Operation Support Log Upload Related Scripts To C Implementation [`#410`](https://github.com/rdkcentral/sysint/pull/410) +- SERXIONE-8331 : Added viper_ipa to exceptions for /media/apps/sky/packages [`#420`](https://github.com/rdkcentral/sysint/pull/420) +- RDK-59247: cleaning up network scripts. [`#402`](https://github.com/rdkcentral/sysint/pull/402) +- RDKEMW-11363: [NM Dispatcher] Reduce repetitive logging [`#415`](https://github.com/rdkcentral/sysint/pull/415) +- Merge tag '4.2.1' into develop [`1df413f`](https://github.com/rdkcentral/sysint/commit/1df413f4f00e87a43eb092c6c57e302d754fba90) +- RDK-59247:Migrate Functionality In Network scripts To Core Modules [`8dd5ab9`](https://github.com/rdkcentral/sysint/commit/8dd5ab957251cfc80d6556560386019ca86088cb) + #### [4.2.1](https://github.com/rdkcentral/sysint/compare/4.2.0...4.2.1) +> 17 December 2025 + - RDKEMW-11602: Name resolution error in Peacock App [`#397`](https://github.com/rdkcentral/sysint/pull/397) - RDKEMW-9242, RDKEMW-11094: Network Migration changes for ENTOS [`#382`](https://github.com/rdkcentral/sysint/pull/382) +- 4.2.1 release changelog updates [`72776fc`](https://github.com/rdkcentral/sysint/commit/72776fce7eb6d9f43dadfacd8ace5e9d397b02fb) - Merge tag '4.2.0' into develop [`7eeb0e9`](https://github.com/rdkcentral/sysint/commit/7eeb0e9b9c7485d30a57dc5b18587641363b74c2) #### [4.2.0](https://github.com/rdkcentral/sysint/compare/4.1.0...4.2.0) diff --git a/lib/rdk/Start_MaintenanceTasks.sh b/lib/rdk/Start_MaintenanceTasks.sh index cea9fbc9..96162eba 100644 --- a/lib/rdk/Start_MaintenanceTasks.sh +++ b/lib/rdk/Start_MaintenanceTasks.sh @@ -70,6 +70,7 @@ SWUPDATE_LOG_FILE="$LOG_PATH/swupdate.log" RFC_BIN="$COMMON_BIN_LOCATION/rfcMgr" SWUPDATE_BIN="$COMMON_BIN_LOCATION/rdkvfwupgrader" LOGUPLOAD_SCRIPT="$RDK_PATH/uploadSTBLogs.sh" +LOG_UPLOAD_BIN_PATH="/usr/bin/logupload" # Log Functions rfcLog () @@ -175,14 +176,48 @@ runMaintenanceLogUploadTask() if [ -n "$TriggerType" ] && [ "$TriggerType" -eq "$ON_DEMAND_LOG_UPLOAD" ]; then logUploadLog "Application triggered on demand log upload" - sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "$TriggerType" 2>/dev/null - result=$? + if [ -x "$LOG_UPLOAD_BIN_PATH" ]; then + logUploadLog "Executing logupload binary: $LOG_UPLOAD_BIN_PATH" + "$LOG_UPLOAD_BIN_PATH" "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "ondemand" >> /opt/logs/dcmscript.log + result=$? + if [ "$result" -eq 0 ]; then + logUploadLog "Binary execution succeeded" + exit 0 + else + logUploadLog "Binary execution failed with result=$result; falling back to script" + sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "$TriggerType" 2>/dev/null + result=$? + fi + else + logUploadLog "logupload binary not found at $LOG_UPLOAD_BIN_PATH...executing script" + sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "$TriggerType" 2>&1 + result=$? + fi else logUploadLog "Log upload triggered from regular execution" - nice -n 19 sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" & - bg_pid=$! - wait $bg_pid - result=$? + if [ -x "$LOG_UPLOAD_BIN_PATH" ]; then + logUploadLog "Executing logupload binary: $LOG_UPLOAD_BIN_PATH" + nice -n 19 "$LOG_UPLOAD_BIN_PATH" "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" >> /opt/logs/dcmscript.log & + bg_pid=$! + wait $bg_pid + result=$? + if [ "$result" -eq 0 ]; then + logUploadLog "Binary execution succeeded" + return 0 + else + logUploadLog "Binary execution failed with result=$result; falling back to script" + nice -n 19 sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" & + bg_pid=$! + wait $bg_pid + result=$? + fi + else + logUploadLog "logupload binary not found at $LOG_UPLOAD_BIN_PATH...executing script" + nice -n 19 sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" & + bg_pid=$! + wait $bg_pid + result=$? + fi fi else logUploadLog "LOGUPLOAD script not found" diff --git a/lib/rdk/getDeviceDetails.sh b/lib/rdk/getDeviceDetails.sh index 372ba4b6..94154583 100755 --- a/lib/rdk/getDeviceDetails.sh +++ b/lib/rdk/getDeviceDetails.sh @@ -324,7 +324,8 @@ executeServiceRequest() executeServiceRequest "friendly_id" executeServiceRequest "build_type" executeServiceRequest "imageVersion" - executeServiceRequest "bluetooth_mac" + #Moved the Bluetooth Mac address update under bluetooth service post action + #executeServiceRequest "bluetooth_mac" if [ "$DEVICE_TYPE" != "mediaclient" ]; then # snmp based / none mediaclient parameter acquisition