[Bugfix][T800][task-view-483] no need delete the file which failed to
transfer
Only Configure: No
Affected branch: unknown
Affected module: log
Is it affected on both ZXIC and MTK: only MTK
Self-test: yes
Doc Update: no
Change-Id: I791bb79711fe2ee5f7caa0c87d4ff2ecc6c581f6
diff --git a/LYNQ_PUBLIC/IC_src/mtk/packages/apps/lynq-log-transfer/lynq_inner_log_transfer.sh b/LYNQ_PUBLIC/IC_src/mtk/packages/apps/lynq-log-transfer/lynq_inner_log_transfer.sh
index 7106ea6..08f8d34 100755
--- a/LYNQ_PUBLIC/IC_src/mtk/packages/apps/lynq-log-transfer/lynq_inner_log_transfer.sh
+++ b/LYNQ_PUBLIC/IC_src/mtk/packages/apps/lynq-log-transfer/lynq_inner_log_transfer.sh
@@ -19,19 +19,12 @@
ERROR_IS_IN_WAIT_TRRANSFER_REMAIN_MTK_LOG=$((ERROR_IS_IN_TRANSFER_LOG+7))
-ERROR_IS_IN_TRANSFER_DBG_LOG=$((ERROR_IS_IN_TRANSFER_LOG+10))
-ERROR_IS_IN_TRANSFER_REMAIN_DBG_LOG=$((ERROR_IS_IN_TRANSFER_LOG+11))
-ERROR_IS_IN_WAIT_TRRANSFER_REMAIN_DBG_LOG=$((ERROR_IS_IN_TRANSFER_LOG+12))
-
-
DEBUG_FILE_PATH=/var/log/
DEBUG_FILE_NAME=syslog.log
-DEBUG_FILE_BACKUP_NAME=log_transfer_debug_0.log
DEBUG_FILE="${DEBUG_FILE_PATH}${DEBUG_FILE_NAME}"
-DEBUG_FILE_BACKUP="${DEBUG_FILE_PATH}${DEBUG_FILE_BACKUP_NAME}"
if [ ! -d ${DEBUG_FILE_PATH} ]; then
- mkdir -p ${DEBUG_FILE_PATH}
+ mkdir -p ${DEBUG_FILE_PATH}
fi
SYS_LOG_PATH="/var/log/"
@@ -43,56 +36,38 @@
LOG_IS_IN_TRANSFER=(
"${CONTROL_FILE_PATH}is_in_transfer_sys_log"
"${CONTROL_FILE_PATH}is_in_transfer_mtk_log"
- "${CONTROL_FILE_PATH}is_in_transfer_dbg_log"
)
WAIT_TRANSFER_REMAIN_LOG=(
"${CONTROL_FILE_PATH}is_in_transfer_remain_sys_log"
"${CONTROL_FILE_PATH}is_in_transfer_remain_mtk_log"
- "${CONTROL_FILE_PATH}is_in_transfer_remain_dbg_log"
)
-
+
TARGET_DIR=(
"lynq/log/lynq_log_1"
"lynq/log/lynq_log_2"
- "None"
)
-
+
target_dir=""
-
-function is_in_debug()
-{
- if [ -e "${LOG_IS_IN_TRANSFER[2]}" ] || [ -e "${WAIT_TRANSFER_REMAIN_LOG[2]}" ]
- then
- return 1
- else
- return 0
- fi
-}
-
log_print=(
"sys log"
"mtk log"
- "dbg log"
)
loop_time=(
5
1
- 10
)
transfer_log_tag=(
0
0
- 0
)
LOG_PREFIX=(
"archive_log"
"MDLog"
- ""
)
log_prefix=""
@@ -100,7 +75,6 @@
SINGLE_FILE_SIZE=(
21
100
- 0
)
single_file_size=10
@@ -108,7 +82,6 @@
INIT_LOG_MAX_SIZE=(
1000
2700
- 0
)
log_num_max=0
LOG_DEL=$(($log_num_max/2))
@@ -117,14 +90,12 @@
Q_CUR_NUM_UCI=(
"lynq_uci.lynq_log.log_1_cur_trf_num"
"lynq_uci.lynq_log.log_2_cur_trf_num"
- ""
)
q_cur_num_uci=""
Q_MAX_SIZE_UCI=(
"lynq_uci.lynq_log.log_1_max_size"
"lynq_uci.lynq_log.log_2_max_size"
- ""
)
q_max_size_uci=""
@@ -136,7 +107,6 @@
UP_LOAD_POSTFIX=(
$TAR_EXT
"muxz"
- ""
)
q_max_size_uci=""
@@ -153,11 +123,11 @@
GPS_LOG_DEL=$(($EXIST_GPS_NUM_MAX/2))
function get_gpslog_del_num()
-{
+{
if [ $1 -lt $((${2}/2)) ]; then
GPS_LOG_DEL=$((${1}+${2}/2))
else
- GPS_LOG_DEL=$((${1}-${2}/2))
+ GPS_LOG_DEL=$((${1}-${2}/2))
fi
}
@@ -175,7 +145,7 @@
gpslog_prefix="gpslog"
for file_name in *."$1"; do
gps_new_file_name=${gpslog_prefix}_${EXIST_GPS_NUM}.$1
- if [ -e "$file_name" ]; then
+ if [ -e "$file_name" ]; then
mv $file_name $GPS_LOG_PATH${gps_new_file_name}
get_gpslog_del_num $EXIST_GPS_NUM $EXIST_GPS_NUM_MAX
ftp_delete_file ${gpslog_prefix}_${GPS_LOG_DEL}.$1.$TAR_EXT
@@ -217,6 +187,38 @@
}
#gpslog transfer to soc end@cz.li,20240314
+function stop_mtk_log_and_clear_dir()
+{
+ echo 7 | emdlogger_ctrl socket
+ rm -rf $MTK_LOG_PATH*
+}
+
+function clear_relative_tag_by_index()
+{
+ #if [ $1 -eq 0 ]; then
+ #rm -rf $SYS_LOG_PATH$log_prefix* #LYNQ_MTK_BUG483_Q.HUANG_20241226_DONT_DELETE_TRANSFER_FAIL_FILE
+ #gpslog transfer to soc begin@cz.li,20240314
+ #no need rm GPS_LOG_PATH and GPS_COF_PATH, because the GPS process cannot dynamically stop/start log output
+ #rm -rf ${GPS_LOG_PATH}
+ #gpslog transfer to soc end@cz.li,20240314
+ if [ $1 -eq 1 ]; then
+ stop_mtk_log_and_clear_dir
+ #LYNQ_MTK_BUG483_Q.HUANG_20241226_DONT_DELETE_TRANSFER_FAIL_FILE_BEGIN
+ # if [ -d ${MTK_LOG_BUFF_PATH} ]; then
+ # rm -rf ${MTK_LOG_BUFF_PATH}
+ # fi
+ #LYNQ_MTK_BUG483_Q.HUANG_20241226_DONT_DELETE_TRANSFER_FAIL_FILE_END
+ fi
+
+ if [ -e ${LOG_IS_IN_TRANSFER[$1]} ]; then
+ rm -rf ${LOG_IS_IN_TRANSFER[$1]}
+ fi
+
+ if [ -e ${WAIT_TRANSFER_REMAIN_LOG[$1]} ]; then
+ rm -rf ${WAIT_TRANSFER_REMAIN_LOG[$1]}
+ fi
+}
+
function clear_relative_tag()
{
length=${#transfer_log_tag[@]}
@@ -224,27 +226,7 @@
for ((i=0;i<$length;i++))
do
if [ ${transfer_log_tag[$i]} -eq 1 ]; then
- if [ $i -eq 0 ]; then
- rm -rf $SYS_LOG_PATH$log_prefix*
- #gpslog transfer to soc begin@cz.li,20240314
- #no need rm GPS_LOG_PATH and GPS_COF_PATH, because the GPS process cannot dynamically stop/start log output
- #rm -rf ${GPS_LOG_PATH}
- #gpslog transfer to soc end@cz.li,20240314
- elif [ $i -eq 1 ]; then
- echo 7 | emdlogger_ctrl
- rm -rf $MTK_LOG_PATH*
- if [ -d ${MTK_LOG_BUFF_PATH} ]; then
- rm -rf ${MTK_LOG_BUFF_PATH}
- fi
- fi
-
- if [ -e ${LOG_IS_IN_TRANSFER[$i]} ]; then
- rm -rf ${LOG_IS_IN_TRANSFER[$i]}
- fi
-
- if [ -e ${WAIT_TRANSFER_REMAIN_LOG[$i]} ]; then
- rm -rf ${WAIT_TRANSFER_REMAIN_LOG[$i]}
- fi
+ clear_relative_tag_by_index $i
fi
done
}
@@ -256,6 +238,15 @@
fi
}
+function show_detail_relative_tag
+{
+ du -h -a $DEBUG_FILE_PATH >> $DEBUG_FILE
+ du -h -a $TMP_LOG_PATH >> $DEBUG_FILE
+ df -h | grep /log >> $DEBUG_FILE
+ uci show | grep log >>$DEBUG_FILE
+ uci show | grep version >>$DEBUG_FILE
+}
+
function show_relative_tag()
{
length=${#LOG_IS_IN_TRANSFER[@]}
@@ -280,19 +271,22 @@
echo_debug_info "$MTK_LOG_PATH exists"
else
echo_debug_info "$MTK_LOG_PATH not exists"
- fi
-}
-
-function rotate_debug_file()
-{
- filesize=`ls -l $DEBUG_FILE | awk '{ print $5 }'`
- maxsize=1000000
- if [ $filesize -gt $maxsize ]; then
- mv $DEBUG_FILE $DEBUG_FILE_BACKUP
- echo ""> $DEBUG_FILE
+ fi
+
+ if [ -d ${MTK_LOG_BUFF_PATH} ]; then
+ echo_debug_info "$MTK_LOG_BUFF_PATH exists"
+ else
+ echo_debug_info "$MTK_LOG_BUFF_PATH not exists"
+ fi
+
+ if [ $1 -ne 0 ]; then
+ show_detail_relative_tag
fi
}
+
+
+
currentTime=`date "+%Y%m%d_%H%M%S"`
add_time_info=""
function add_time_to_info()
@@ -309,28 +303,23 @@
}
-DBG_INFO_PREFIX="lynq_log_transfer "
+DBG_INFO_PREFIX="lynq_log_trf_"
function echo_debug_info()
{
- echo $1
- is_in_debug
- if [ $? -eq 1 ]; then
- add_time_and_prefix_to_info " $1" $DBG_INFO_PREFIX
- echo $add_time_and_prefix_info >> $DEBUG_FILE
-# rotate_debug_file
- fi
+ echo $1
+ add_time_and_prefix_to_info " $1" $DBG_INFO_PREFIX
+ echo $add_time_and_prefix_info >> $DEBUG_FILE
}
function print_usage()
{
- echo "Usage : lynq-log-transfer 0 | 1 | 2 | 3 | 101 | 102 | 103 " >&2
- echo "0 : Init, param like this: 0 config_id" >&2
+ echo "Usage : lynq-log-transfer 0 | 1 | 2 | 3 | 101 | 102 " >&2
+ echo "0 : Init, param like this: 0 config_id" >&2
echo "1 : Start Transfer syslog, param like this: 1 192.168.10.10 21 username passwword" >&2
echo "2 : Start Transfer mtklog, param like this: 2 192.168.10.10 21 username passwword" >&2
- echo "3 : Start debug and Transfer debug log, param like this: 3" >&2
+ echo "3 : Show Debug state info debug, param like this: 3" >&2
echo "101 : Stop transfer sys log, param like this: 101" >&2
- echo "102 : Stop transfer mtk log, param like this: 102" >&2
- echo "103 : Stop debug and stop transfer debug log, param like this: 103" >&2
+ echo "102 : Stop transfer mtk log, param like this: 102" >&2
echo " ">&2
echo " ">&2
}
@@ -342,7 +331,7 @@
echo_debug_info "normal exit"
;;
$ERROR_PARAM)
- print_usage
+ print_usage
echo_debug_info "param error"
;;
$ERROR_FTP_SERVER_PING_NOT_OK)
@@ -371,20 +360,12 @@
;;
$ERROR_IS_IN_WAIT_TRRANSFER_REMAIN_MTK_LOG)
echo_debug_info "is still waitting transfer remain mtk log"
- ;;
- $ERROR_IS_IN_TRANSFER_DBG_LOG)
- echo_debug_info "is still in transfering dbg log"
- ;;
- $ERROR_IS_IN_TRANSFER_REMAIN_DBG_LOG)
- echo_debug_info "is still in transfering remain dbg log"
- ;;
- $ERROR_IS_IN_WAIT_TRRANSFER_REMAIN_DBG_LOG)
- echo_debug_info "is still waitting transfer remain dbg log"
- ;;
+ ;;
*)
echo_debug_info "other error"
;;
esac
+ echo_debug_info "curIndex is $CUR_LOG_NUM, max index is $log_index_max"
}
ftp_server="192.168.125.111/"
@@ -400,35 +381,20 @@
new_file_name=$new_file_name.$TAR_EXT
fi
- curl ftp://$ftp_server:$ftp_port/$target_dir/ -u "${ftp_user_name}:${ftp_password}" -T $new_file_name 1>/dev/null
+ curl --connect-timeout 15 ftp://$ftp_server:$ftp_port/$target_dir/ -u "${ftp_user_name}:${ftp_password}" -T $new_file_name 1>/dev/null
ret=$?
- rm -rf $new_file_name
+ if [ $ret -eq 0 ]; then #LYNQ_MTK_BUG483_Q.HUANG_20241226_DONT_DELETE_TRANSFER_FAIL_FILE
+ rm -rf $new_file_name
+ fi
return $ret
}
-function ftp_cp_file_after_add_tag()
-{
- if [ -e ${1} ]; then
- add_time_and_prefix_to_info $1 $2
- cp $1 $add_time_and_prefix_info
- ftp_transfer_file_then_delete $add_time_and_prefix_info 1
- return $?
- fi
-}
-
CUR_LOG_NUM=0
-function save_cur_log_num_to_uci()
-{
- if [ ! -z $q_cur_num_uci ]; then
- uci set ${q_cur_num_uci}=${CUR_LOG_NUM}
- fi
-}
function exit_process()
{
print_exit_info $1
clear_relative_tag_when_exit $1
- save_cur_log_num_to_uci
exit $1
}
@@ -456,24 +422,44 @@
if [ $CUR_LOG_NUM -gt $log_index_max ]; then
CUR_LOG_NUM=0
fi
+ uci set ${q_cur_num_uci}=${CUR_LOG_NUM}
+ uci commit
}
function ftp_delete_file()
{
q_cmd="DELE $target_dir/$1"
- curl -u $ftp_user_name:$ftp_password ftp://$ftp_server:$ftp_port -Q "$q_cmd" 1>/dev/null
+ curl --connect-timeout 15 -u $ftp_user_name:$ftp_password ftp://$ftp_server:$ftp_port -Q "$q_cmd" 1>/dev/null
}
function get_del_num()
-{
+{
if [ $1 -lt $((${2}/2)) ]; then
LOG_DEL=$((${1}+${2}/2))
else
- LOG_DEL=$((${1}-${2}/2))
+ LOG_DEL=$((${1}-${2}/2))
fi
}
+function transfer_last_remain_syslog_file()
+{
+ cd ${SYS_LOG_PATH}
+ for syslog_file in ${log_prefix}*.$TAR_EXT ; do
+ if [ ! -e "$syslog_file" ]; then
+ continue
+ fi
+ file_index=$(echo ${syslog_file} | cut -d '_' -f 3 | cut -d '.' -f 1)
+ get_del_num ${file_index} ${log_num_max}
+ ftp_delete_file ${log_prefix}_${LOG_DEL}.$TAR_EXT
+ ftp_transfer_file_then_delete $syslog_file 0
+ if [ $? -ne 0 ]; then
+ exit_process $ERROR_FTP_TRANSFER_FAIL
+ fi
+ done
+ rm -rf $SYS_LOG_PATH$log_prefix*
+}
+
function do_sys_log_transfer()
{
cd ${SYS_LOG_PATH}
@@ -498,23 +484,28 @@
ftp_delete_file ${log_prefix}_${LOG_DEL}.$TAR_EXT
ftp_transfer_file_then_delete ${log_prefix}_${SYSLOG_INDEX[$j]}.$TAR_EXT 0
if [ $? -ne 0 ]; then
- echo_debug_info "ftp error code is $?"
+ echo_debug_info "ftp error code is $?"
exit_process $ERROR_FTP_TRANSFER_FAIL
fi
- done
+ done
}
function do_backup_mtk_log()
{
- cd $MTK_LOG_BUFF_PATH
- for muxzfile in *."$1"; do
+ cd $MTK_LOG_BUFF_PATH
+ for muxzfile in *."$1"; do
+ if [ ! -e "$muxzfile" ]; then
+ continue
+ fi
get_del_num $CUR_LOG_NUM $log_num_max
- ftp_delete_file ${log_prefix}_${LOG_DEL}.muxz
+ ftp_delete_file ${log_prefix}_${LOG_DEL}.muxz
ftp_transfer_file_then_delete $muxzfile 0
- if [ $? -ne 0 ]; then
+ if [ $? -ne 0 ]; then
exit_process $ERROR_FTP_TRANSFER_FAIL
- fi
- done
+ else
+ do_cur_log_num_plus
+ fi
+ done
cd -
}
@@ -524,29 +515,15 @@
while true
do
file_name=$(find -name \*"$1" | xargs ls -lthr | head -1 | awk '{print $9}')
- if [ -n "$file_name" ]; then
+ if [ -n "$file_name" ]; then
mv $file_name $MTK_LOG_BUFF_PATH${log_prefix}_${CUR_LOG_NUM}.muxz
- do_backup_mtk_log "muxz"
- do_cur_log_num_plus
+ do_backup_mtk_log "muxz"
else
break;
fi
done
}
-function do_dbg_log_transfer()
-{
- if [ $ftp_server = "127.0.0.1" ]; then
- return
- fi
-
- cd $DEBUG_FILE_PATH
-
- ftp_cp_file_after_add_tag $1 "debug_"
- if [ $? -eq 0 ]; then
- rm -rf $1
- fi
-}
function send_remain_log()
{
@@ -562,11 +539,7 @@
elif [ $1 -eq 1 ];
then
do_mtk_log_transfer "muxz"
- do_mtk_log_transfer "muxz.tmp"
- elif [ $1 -eq 2 ];
- then
- do_dbg_log_transfer $DEBUG_FILE_BACKUP_NAME
- do_dbg_log_transfer $DEBUG_FILE_NAME
+ do_mtk_log_transfer "muxz.tmp"
fi
}
@@ -581,10 +554,7 @@
#gpslog transfer to soc end@cz.li,20240314
elif [ $1 -eq 1 ];
then
- do_mtk_log_transfer "muxz"
- elif [ $1 -eq 2 ];
- then
- do_dbg_log_transfer $DEBUG_FILE_BACKUP_NAME
+ do_mtk_log_transfer "muxz"
fi
}
@@ -603,7 +573,7 @@
if [ -e ${WAIT_TRANSFER_REMAIN_LOG[$1]} ]; then
rm ${WAIT_TRANSFER_REMAIN_LOG[$1]}
fi
- clear_relative_tag
+ clear_relative_tag_by_index $1
}
@@ -626,8 +596,9 @@
echo_debug_info "${log_print[$1]} transfer stoping "
wait_transfer_remain_log $1
if [ -e ${WAIT_TRANSFER_REMAIN_LOG[$1]} ]; then
- rm ${WAIT_TRANSFER_REMAIN_LOG[$1]}
- fi
+ rm ${WAIT_TRANSFER_REMAIN_LOG[$1]}
+ clear_relative_tag_by_index $1
+ fi
fi
}
@@ -658,67 +629,89 @@
function delete_beyond_log()
{
- post_fix=${UP_LOAD_POSTFIX[$1]}
-
- for j in `seq $2 $3`
- do
- ftp_delete_file ${log_prefix}_${j}.${post_fix}
- done
+ post_fix=${UP_LOAD_POSTFIX[$1]}
+
+ for j in `seq $2 $3`
+ do
+ ftp_delete_file ${log_prefix}_${j}.${post_fix}
+ done
}
function get_init_cur_log_num()
{
- q_cur_num_uci=${Q_CUR_NUM_UCI[$1]}
+ q_cur_num_uci=${Q_CUR_NUM_UCI[$1]}
if [ ! -z $q_cur_num_uci ]; then
q_uci_value=`uci get $q_cur_num_uci`
if [ -z $q_uci_value ];
then
uci set ${q_cur_num_uci}=${CUR_LOG_NUM}
+ uci commit
else
CUR_LOG_NUM=$(($q_uci_value))
- fi
+ fi
if [ $CUR_LOG_NUM -gt $log_index_max ]; then
- delete_beyond_log $1 $log_index_max $(($CUR_LOG_NUM-1))
+ delete_beyond_log $1 $log_index_max $(($CUR_LOG_NUM-1))
CUR_LOG_NUM=$log_index_max
uci set ${q_cur_num_uci}=${CUR_LOG_NUM}
+ uci commit
fi
- fi
+ fi
}
function get_single_file_size()
{
- single_file_size=${SINGLE_FILE_SIZE[$1]}
-
+ single_file_size=${SINGLE_FILE_SIZE[$1]}
+
if [ $1 -eq 1 ]; then
- q_uci_value=`uci get mdlog.property.md_log_size`
- if [ ! -z $q_uci_value ];
- then
- single_file_size=$(($(($q_uci_value))*10))
- fi
- fi
+ q_uci_value=`uci get mdlog.property.md_log_size`
+ if [ ! -z $q_uci_value ];
+ then
+ single_file_size=$(($(($q_uci_value))*10))
+ fi
+ fi
}
function get_init_max_log_num()
{
- init_log_max_size=${INIT_LOG_MAX_SIZE[$1]}
- q_max_size_uci=${Q_MAX_SIZE_UCI[$1]}
-
- get_single_file_size $1
+ init_log_max_size=${INIT_LOG_MAX_SIZE[$1]}
+ q_max_size_uci=${Q_MAX_SIZE_UCI[$1]}
+
+ get_single_file_size $1
if [ ! -z $q_max_size_uci ]; then
q_uci_value=`uci get $q_max_size_uci`
if [ -z $q_uci_value ];
then
uci set ${q_max_size_uci}=$init_log_max_size
+ uci commit
log_num_max=$(($init_log_max_size*20/single_file_size))
else
log_num_max=$(($(($q_uci_value))*20/single_file_size))
- fi
+ fi
fi
- log_index_max=$(($log_num_max-1))
+ log_index_max=$(($log_num_max-1))
}
+cur_uci_md_mod=0
+function is_mtk_log_start()
+{
+ second=0
+ while [ $second -lt 10 ]
+ do
+ q_uci_value=`uci get mdlog.property.md_current_mode`
+ cur_uci_md_mod=$(($q_uci_value))
+ if [ $cur_uci_md_mod -ne 0 ]; then
+ echo_debug_info "start mtk log ok"
+ return
+ fi
+ sleep 1
+ ((second=second+1))
+ done
+}
+
+
+
function loop_prepare()
{
#gpslog transfer to soc begin@cz.li,20240314
@@ -726,58 +719,71 @@
init_gpslog
#gpslog transfer to soc end@cz.li,20240314
elif [ $1 -eq 1 ]; then
- echo 6 | emdlogger_ctrl
- if [ $? -ne 0 ]; then
- echo_debug_info "start mtk log fail"
- exit_process $ERROR_INNER_ERROR
- fi
if [ ! -d ${MTK_LOG_BUFF_PATH} ]; then
mkdir -p ${MTK_LOG_BUFF_PATH}
fi
+ echo 6 | emdlogger_ctrl socket
+ is_mtk_log_start
+ if [ $cur_uci_md_mod -eq 0 ]; then
+ echo_debug_info "start mtk log fail"
+ show_relative_tag $1
+ stop_mtk_log_and_clear_dir
+ exit_process $ERROR_INNER_ERROR
+ fi
fi
- target_dir=${TARGET_DIR[$1]}
+ target_dir=${TARGET_DIR[$1]}
log_prefix=${LOG_PREFIX[$1]}
-
+
get_init_max_log_num $1
get_init_cur_log_num $1
-
+
if [ ! -z $target_dir ]; then
# 3 times for guarrantee
curl -u $ftp_user_name:$ftp_password -XPWD -p -e ftp://$ftp_server:$ftp_port/$target_dir --ftp-create-dirs ftp://$ftp_server:$ftp_port/$target_dir/ 1>/dev/null
- curl -u $ftp_user_name:$ftp_password -XPWD -p -e ftp://$ftp_server:$ftp_port/$target_dir --ftp-create-dirs ftp://$ftp_server:$ftp_port/$target_dir/ 1>/dev/null
+ curl -u $ftp_user_name:$ftp_password -XPWD -p -e ftp://$ftp_server:$ftp_port/$target_dir --ftp-create-dirs ftp://$ftp_server:$ftp_port/$target_dir/ 1>/dev/null
curl -u $ftp_user_name:$ftp_password -XPWD -p -e ftp://$ftp_server:$ftp_port/$target_dir --ftp-create-dirs ftp://$ftp_server:$ftp_port/$target_dir/ 1>/dev/null
+ fi
+
+#LYNQ_MTK_BUG483_Q.HUANG_20241226_DONT_DELETE_TRANSFER_FAIL_FILE_BEGIN
+ if [ $1 -eq 0 ]; then
+ transfer_last_remain_syslog_file
+ elif [ $1 -eq 1 ]; then
+ do_backup_mtk_log "muxz"
fi
+#LYNQ_MTK_BUG483_Q.HUANG_20241226_DONT_DELETE_TRANSFER_FAIL_FILE_END
}
function trigger_log_transfer()
{
index=$((${1}-1))
+
+ if [ $index -eq 2 ]; then
+ show_relative_tag $index
+ return
+ fi
+
+ #afterwards index only have 0~1
+
if [ -e ${LOG_IS_IN_TRANSFER[$index]} ]; then
exit_process $((ERROR_IS_IN_TRANSFER_LOG+${index}*5 ))
fi
if [ -e ${WAIT_TRANSFER_REMAIN_LOG[$index]} ]; then
exit_process $((ERROR_IS_IN_TRANSFER_LOG+${index}*5+1))
- fi
-
- if [ $index -ne 2 ]; then
- get_ftp_param $# $2 $3 $4 $5
- transfer_log_tag[$index]=1
- loop_prepare $index
- fi
-
+ fi
+
+ get_ftp_param $# $2 $3 $4 $5
+
+ transfer_log_tag[$index]=1
+
+ loop_prepare $index
+
touch ${LOG_IS_IN_TRANSFER[${index}]}
- echo_debug_info "transfer ${log_print[$index]}"
-
- if [ $index -eq 2 ]; then
- echo_debug_info "log transfer param_num $# param $* start"
- show_relative_tag
- return
- fi
+ show_relative_tag $index
do_loop ${index} ${loop_time[$index]}
}
@@ -794,12 +800,7 @@
#rm -rf ${GPS_LOG_PATH}
#gpslog transfer to soc end@cz.li,20240314
if [ $index -eq 1 ]; then
- echo 7 | emdlogger_ctrl
- elif [ $index -eq 2 ]; then
- show_relative_tag
- echo_debug_info "log transfer param_num $# param $* complete"
- rm ${LOG_IS_IN_TRANSFER[$index]}
- return
+ echo 7 | emdlogger_ctrl socket
fi
stop_log_transfer $index
@@ -810,27 +811,24 @@
if [ ! -d $MTK_LOG_MOUNT_PATH ];
then
echo_debug_info "init md log start"
+ stop_mtk_log_and_clear_dir
mkdir -p $MTK_LOG_MOUNT_PATH
- echo 7 | emdlogger_ctrl
- rm -rf $MTK_LOG_PATH*
mount -o bind $MTK_LOG_MOUNT_PATH $MTK_LOG_PATH
rm -rf $MTK_LOG_PATH*
uci set mdlog.property.md_cyclic_size='36'
uci set mdlog.property.md_log_size=$((${SINGLE_FILE_SIZE[1]}/10))
uci commit
- killall emdlogger1
+ killall emdlogger1
echo_debug_info "init md log end"
- fi
+ fi
}
function init_log_transfer_ui()
{
index=$2
if [ $index -eq 1 ]; then
- # activate debug
- trigger_log_transfer 3
init_md_log
- fi
+ fi
}
echo_debug_info "log transfer param_num $# param $* start"
@@ -839,16 +837,18 @@
[1-3])
trigger_log_transfer "$@"
;;
- 101|102|103)
+ 101|102)
stop_log_transfer_ui "$@"
;;
0)
init_log_transfer_ui "$@"
- ;;
+ ;;
*)
exit_process $ERROR_PARAM
;;
esac
echo_debug_info "log transfer param_num $# param $* complete"
-exit_process 0
+exit_process 0
+
+
\ No newline at end of file