Index: scripts/globals.sh =================================================================== diff -u -r40df70a24319606b740ee1eb54d745b432e06c96 -r7043fc77b485a921010c79cffd12ab95e8126ac2 --- scripts/globals.sh (.../globals.sh) (revision 40df70a24319606b740ee1eb54d745b432e06c96) +++ scripts/globals.sh (.../globals.sh) (revision 7043fc77b485a921010c79cffd12ab95e8126ac2) @@ -115,8 +115,12 @@ SETUP_ENABLE_MANUFACTURING_MODE="ManufacturingMode" SETUP_ENABLE_UpdatingING_MODE="UpdatingMode" +# Log cli options +# x: enable long name (IMPORTANT: removed for the impact on Test Protocols, and timeline) +# y: enable upload +# z: enable compression +APPLICATION_PARAMS_DEFAULT="-Xyz" APPLICATION_PARAMS="" -APPLICATION_PARAMS_DEFAULT="-xyz" # log x: long name, y: upload, z: compressed CloudSync_DRT_SERVER_IP="" CloudSync_DRT_SERVER_PORT=80 @@ -131,6 +135,9 @@ SETTING_CONF_FOLDER_PATH=/var/configurations SETTINGS_CRC_FILE_PATH=$DENALI_HOME/settings.crc +CLOUDSYNC_CONFIG_SRC=$CLOUD_HOME/cloudsync/cloudsync/config/config.json +CLOUDSYNC_CONFIG_DST=$SETTING_CONF_FOLDER_PATH/CloudSync/config/config.json + DEMO_MODE=0 P_CANBUS=can0 V_CANBUS=can1 @@ -566,9 +573,9 @@ echo "" } -function startCloudSync_local() { - # ----------------------------------------- CloudSync - post_log_dash " CloudSync " +function cleanCloudSyncBufs() { + # ----------------------------------------- CloudSync buffs cleanup + post_log_dash " CloudSync buffs cleanup" local CLOUDSYNC_PATH=$CLOUD_HOME/$CLOUDSYNC_FOLDER local DATE_UTC=$(date -u +%Y_%m_%d) if [ -d $CLOUDSYNC_PATH ]; then @@ -582,6 +589,23 @@ sudo -u $CLOUD_USER touch "$CLOUDSYNC_LOGS/$DATE_UTC"_out.buf sudo -u $DENALI_USER touch "$CLOUDSYNC_LOGS/$DATE_UTC"_inp.buf + fi +} + +function startCloudSync_local() { + # ----------------------------------------- CloudSync + post_log_dash " CloudSync " + local CLOUDSYNC_PATH=$CLOUD_HOME/$CLOUDSYNC_FOLDER + local DATE_UTC=$(date -u +%Y_%m_%d) + if [ -d $CLOUDSYNC_PATH ]; then + post_log "Verify the CloudSync config" + if [ "$( diff $CLOUDSYNC_CONFIG_SRC $CLOUDSYNC_CONFIG_DST )" != "" ]; then + post_log "CloudSync configuration updated" + sudo -u $CLOUD_USER cp $CLOUDSYNC_CONFIG_SRC $CLOUDSYNC_CONFIG_DST 1>> $POSTOUT 2>> $POSTERR + else + post_log "CloudSync configuration verified" + fi + echo "Executing the CloudSync" cd $CLOUDSYNC_PATH sudo -u $CLOUD_USER ./cs.py start @@ -608,7 +632,7 @@ if [ $(isDemoMode) -eq $TRUE ]; then APPLICATION_PARAMS="$APPLICATION_PARAMS"" -q -D -A $D_CANBUS" fi - sudo -u $DENALI_USER $DENALI_HOME/$DENALI_BIN $APPLICATION_PARAMS_DEFAULT $APPLICATION_PARAMS 1>> /tmp/denali.out 2>> /tmp/denali.out & + sudo -u $DENALI_USER $DENALI_HOME/$DENALI_BIN $APPLICATION_PARAMS_DEFAULT $APPLICATION_PARAMS -C 1>> /tmp/denali.out 2>> /tmp/denali.out & else post_log_fail "Unknown Applicaion Version for $DENALI_HOME/$DENALI_BIN" fi @@ -621,13 +645,13 @@ post_log_dash " Demo Mode " local DRYDEMO_PATH=$DEMO_HOME/$SRC_PATH_DRYDEMO cd $DRYDEMO_PATH - ./run.py > $DRYDEMO_PATH.log & # create the log file at same level and name of the folder. + ./drydemo "-A $D_CANBUS" post_log "Dry-Demo Started" fi } function log_backup() { - if [[ "$1" == "" ]]; then + if [[ "$1" == "" ]]; then post_log "Log Backup failed: Missing log location" return $ERR_LOGBACKUP_PATH; fi @@ -695,4 +719,3 @@ testTouchscreen testCloudSystem } -