Order polling wait (#581)

acme/client.go

@@ -708,26 +708,31 @@ func (c *Client) requestCertificateForCsr(order orderResource, bundle bool, csr
 		}
 	}
 
-	maxChecks := 1000
+	stopTimer := time.NewTimer(30 * time.Second)
-	for i := 0; i < maxChecks; i++ {
+	defer stopTimer.Stop()
+	retryTick := time.NewTicker(500 * time.Millisecond)
+	defer retryTick.Stop()
+
+	for {
+		select {
+		case <-stopTimer.C:
+			return nil, errors.New("certificate polling timed out")
+		case <-retryTick.C:
 			_, err := getJSON(order.URL, &retOrder)
 			if err != nil {
 				return nil, err
 			}
+
 			done, err := c.checkCertResponse(retOrder, &certRes, bundle)
 			if err != nil {
 				return nil, err
 			}
 			if done {
-			break
-		}
-		if i == maxChecks-1 {
-			return nil, fmt.Errorf("polled for certificate %d times; giving up", i)
-		}
-	}
-
 				return &certRes, nil
 			}
+		}
+	}
+}
 
 // checkCertResponse checks to see if the certificate is ready and a link is contained in the
 // response. if so, loads it into certRes and returns true. If the cert