Index: scripts/globals.sh =================================================================== diff -u -r31cd3db6a572b6d9d69d85968e9d5d1f6da88e5c -r244615a978e4de04deb018eb255f068c2a6023bc --- scripts/globals.sh (.../globals.sh) (revision 31cd3db6a572b6d9d69d85968e9d5d1f6da88e5c) +++ scripts/globals.sh (.../globals.sh) (revision 244615a978e4de04deb018eb255f068c2a6023bc) @@ -42,6 +42,12 @@ LOG_OUT_FILE="" LOG_ERR_FILE="" +LOG_BASE=$SDCARD_MNT +LOG_LOC_LOG=log +LOG_LOC_ERR=service +EXT_GZIP=gz +EXT_PEND=u + ERR_MISSING_FOLDER=101 ERR_MISSING_FILE=102 ERR_CONNECTION=103 @@ -53,6 +59,7 @@ ERR_SCP_FAIL=110 ERR_INVALID_IP=111 ERR_SD_CARD=112 +ERR_LOGBACKUP_PATH=113 SRC_FILE_SSHKEY="$HOME/.ssh/id_rsa" SRC_FILE_SSHKEY_PUB=$SRC_FILE_SSHKEY.pub @@ -618,17 +625,48 @@ fi } -function timerStart() { - time_start=$(date +%s) +function log_backup() { + if [[ "$1" == "" ]]; then + post_log "Log Backup failed: Missing log location" + return $ERR_LOGBACKUP_PATH; + fi + local LOG_PATH="$LOG_BASE"/"$1" + cd "$LOG_PATH" + for logname in $(find -type f ! -name "*.$EXT_PEND.*"); do + name=$(basename $logname) + base="${name%%.*}" + ext="${name##*.}" + exts="${name#*.}" + #DEBUG echo name: $base + #DEBUG echo ext : $ext + #DEBUG echo exts: $exts + if [[ "$ext" == "$EXT_GZIP" ]]; then + mv "$name" "$base.u.$exts" + else + echo gzip "$name" + echo mv "$name.$EXT_GZIP" "$base.$EXT_PEND.$exts.$EXT_GZIP" + fi + echo + done } +function log_backup_logApp() { + log_backup $LOG_LOC_LOG +} -#TODO later improvement -# function checkLogBackups() { -# find -# filename="$SDCARD_MNT/log/" && filename2="${filename%.*}"".u."${filename##*.} && mv "$filename" "$filename2" && gzip $filename2 && ls log -# } +function log_backup_logErr() { + log_backup $LOG_LOC_ERR +} +function backupApplicationLogs() { + log_backup_logApp + log_backup_logErr +} + +function timerStart() { + time_start=$(date +%s) +} + function timerEndLog() { # ----------------------------------------- END # tag the end time in the POST log file @@ -642,6 +680,7 @@ setupConsoleout disableRootSSH cleanupPOSTLogs + backupApplicationLogs checkDemoMode queryOSVersion setupCANBus $1 @@ -655,3 +694,4 @@ testTouchscreen testCloudSystem } +