Index: scripts/globals.sh =================================================================== diff -u -r582062f844b8b1b907be17a6de75afe704f8472d -r424ae5459e5b7d65a6211bd153f15c9ef82f9362 --- scripts/globals.sh (.../globals.sh) (revision 582062f844b8b1b907be17a6de75afe704f8472d) +++ scripts/globals.sh (.../globals.sh) (revision 424ae5459e5b7d65a6211bd153f15c9ef82f9362) @@ -47,6 +47,7 @@ LOG_LOC_ERR=service EXT_GZIP=gz EXT_PEND=u +EXT_UPLOAD=c ERR_MISSING_FOLDER=101 ERR_MISSING_FILE=102 @@ -81,6 +82,7 @@ POSTLOG=/tmp/post.log POSTERR=/tmp/post.err POSTOUT=/tmp/post.out +BACKUPLOG=/tmp/backuplog.log POSTMSG_POSTFIX_PASSED=" passed" POSTMSG_POSTFIX_FAILED=" failed" POSTMSG_CANBUS="CANBus" @@ -283,6 +285,9 @@ function post_out () { echo "$1" >> $POSTOUT; } function post_out_dash () { echo "$COMMENT_DASH$1" >> $POSTOUT; } +function backup_log_dash () { echo "$COMMENT_DASH$1" >> $BACKUPLOG; echo "$COMMENT_DASH$1" > "$COUT"; } +function backup_log () { echo "$1" >> $BACKUPLOG; echo " $1" > "$COUT"; } + function debug () { echo_dash_comment echo_dash_message "$1" @@ -655,35 +660,50 @@ post_log "Log Backup failed: Missing log location" return $ERR_LOGBACKUP_PATH; fi + local DATE=$(date +%Y%m%d) local LOG_PATH="$LOG_BASE"/"$1" cd "$LOG_PATH" - for logname in $(find -type f ! -name "*.$EXT_PEND.*"); do + + # Uncomment the below for debugging + # post_log "$LOG_PATH" + for logname in $(find -type f ! -name "*.$EXT_PEND.*" ! -name "*.$EXT_UPLOAD.*" ! -name "*$DATE*"); do name=$(basename $logname) base="${name%%.*}" ext="${name##*.}" exts="${name#*.}" - #DEBUG echo name: $base - #DEBUG echo ext : $ext - #DEBUG echo exts: $exts + + backup_log "Backing up log: $name" + # Uncomment the below for debugging + # backup_log "echo name: $base" + # backup_log "echo ext : $ext" + # backup_log "echo exts: $exts" if [[ "$ext" == "$EXT_GZIP" ]]; then - mv "$name" "$base.u.$exts" + mv "$name" "$base.c.$exts" else - echo gzip "$name" - echo mv "$name.$EXT_GZIP" "$base.$EXT_PEND.$exts.$EXT_GZIP" + gzip "$name" + mv "$name.$EXT_GZIP" "$base.$EXT_PEND.$exts.$EXT_GZIP" fi - echo done + cd } +function saveBackupLog() { + cat $BACKUPLOG >> $POSTLOG + rm $BACKUPLOG +} + function log_backup_logApp() { + backup_log_dash " Application " log_backup $LOG_LOC_LOG } function log_backup_logErr() { + backup_log_dash " Service " log_backup $LOG_LOC_ERR } function backupApplicationLogs() { + backup_log_dash " LOG BACKUP " log_backup_logApp log_backup_logErr } @@ -706,12 +726,6 @@ disableRootSSH cleanupPOSTLogs - #TODO commented out for now there is a bug reported [ DEN-17187 ] - # that if the device is off during midnight logs are not backed up on next boot up. - # which is what this function has to do. - # I have also saw some unexpected console outputs, that would like to investigate further. - # backupApplicationLogs - checkDemoMode queryOSVersion setupCANBus $1 @@ -724,4 +738,6 @@ setupBluetooth testTouchscreen testCloudSystem + + backupApplicationLogs & }