Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit d832adc9 authored by Jonathan Schaeffer's avatar Jonathan Schaeffer
Browse files

Format update

parent d55facbd
......@@ -36,9 +36,8 @@ format_report(){
DATE=$3
DURATION=$4
THROUGHPUT=$5
SHA=$6
COMMENT=${@:7}
printf " %6s | %9s | %9s | %13s | %16s | %6s | %6s | %18s | %s" $Y $N $S $SIZE $DATE $DURATION $THROUGHPUT $SHA "${COMMENT}"
printf " %6s | %9s | %9s | %13s | %16s | %6s | %6s | %18s | %s" $Y $N $S $SIZE $DATE $DURATION $THROUGHPUT "${COMMENT}"
echo
}
......@@ -66,7 +65,7 @@ irods_push(){
throughput=$(($SIZEMB / $duration ))
if [[ $IPUTRC -ne 0 ]]; then
echo "[$KEY] Error 011 sending file to irods. The command was: $COMMAND"
format_report $KEY $SIZEMB $(date +%Y-%m-%dT%H%M%S --date=@$start) $duration $throughput 'Error 011. Transfer Cancelled' >> $LOCAL_REPORT
format_report $KEY $SIZEMB $(date +%Y-%m-%dT%H%M%S --date=@$start) $duration $throughput 'Error 011. Transfer cancelled' >> $LOCAL_REPORT
# Roll back
irods_rollback $KEY
# Alert to zabbix
......@@ -245,7 +244,7 @@ for dir in $(find . -maxdepth 3 -type d | sort); do
# If the hashes differs, then move distant file and push this one
if [[ "$local_sha" = "$irods_sha" ]]; then
echo "[$KEY] The archive on irods is the same as our version. Skipping."
format_report $KEY "-" $(date +%Y-%m-%dT%H%M%S --date=@$start) "-" "-" "skipped" >> $LOCAL_REPORT
format_report $KEY "-" $(date +%Y-%m-%dT%H%M%S --date=@$start) "-" "-" "Skipped" >> $LOCAL_REPORT
continue
fi
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment