From: mwolson_admin <mwolson_admin@deleuze.hcoop.net>
Date: Mon, 30 Jun 2008 18:51:12 +0000 (-0400)
Subject: s3: Use better retry logic.
X-Git-Url: http://git.hcoop.net/clinton/scripts.git/commitdiff_plain/ff624219a1c29c6b67c35b0034f20b8b0c3a7398?ds=sidebyside

s3: Use better retry logic.
---

diff --git a/s3 b/s3
index 9601162..398ce32 100755
--- a/s3
+++ b/s3
@@ -160,14 +160,18 @@ s3_curl() {
   headers[${#headers[@]}]="Date: ${date}"
   [[ ${md5} ]] && headers[${#headers[@]}]="Content-MD5: ${md5}"
   tries=0
-  while test $tries -lt $ATTEMPTS; do
-    tries=$(expr $tries + 1)
+  while true; do
     $CURL ${arg} "${inout}" ${stdopts} -K <(curl_headers "${headers[@]}") \
        "http://s3.amazonaws.com${bucket}${remote}"
     ret=$?
     test $ret -eq 0 && break; 
-    sleep $ATTEMPT_WAIT
-    echo "Retrying ..."
+    if test $tries -lt $ATTEMPTS; then
+        tries=$(expr $tries + 1)
+        echo "Retrying ..."
+        sleep $ATTEMPT_WAIT
+    else
+        break
+    fi
   done
   return $ret
 }