@@ -4,11 +4,14 @@ import (
44 "fmt"
55 "log"
66 "strings"
7+ "time"
78
9+ "github.com/avast/retry-go/v4"
810 "github.com/go-acme/lego/v4/certificate"
911 "github.com/paraparty/acme-task/imagex"
1012 "github.com/paraparty/acme-task/model"
1113 volc "github.com/volcengine/volc-sdk-golang/base"
14+ volcImagex "github.com/volcengine/volc-sdk-golang/service/imagex"
1215)
1316
1417func ImageXHandler (task * model.Task , certificates * certificate.Resource ) error {
@@ -23,16 +26,38 @@ func ImageXHandler(task *model.Task, certificates *certificate.Resource) error {
2326 SecretAccessKey : task .TaskDetails .Credential .SecretKey ,
2427 })
2528
26- addedCert , err := imagex .AddCert (imagexService , certificates )
29+ var addedCert * model.AddCertResponse
30+ err := retry .Do (func () error {
31+ var err error
32+ addedCert , err = imagex .AddCert (imagexService , certificates )
33+ if err != nil {
34+ return err
35+ }
36+ return nil
37+ }, retry .Attempts (3 ), retry .Delay (time .Second * 5 ), retry .OnRetry (func (n uint , err error ) {
38+ log .Printf ("add cert error: retry:%d err:%+v" , n , err )
39+ }))
2740 if err != nil {
2841 return err
2942 }
3043
31- servicesInfo , err := imagexService .GetImageServices ("" )
44+ var servicesInfo * volcImagex.GetServicesResult
45+ err = retry .Do (func () error {
46+ var err error
47+ servicesInfo , err = imagexService .GetImageServices ("" )
48+ if err != nil {
49+ return err
50+ }
51+ return nil
52+ }, retry .Attempts (3 ), retry .OnRetry (func (n uint , err error ) {
53+ log .Printf ("get service info error: retry:%d err:%+v" , n , err )
54+ }))
3255 if err != nil {
3356 return err
3457 }
3558
59+ time .Sleep (time .Second * 5 )
60+
3661 for _ , service := range servicesInfo .Services {
3762 log .Printf ("now processing service %s(%s)" , service .ServiceName , service .ServiceId )
3863
@@ -47,9 +72,17 @@ func ImageXHandler(task *model.Task, certificates *certificate.Resource) error {
4772 continue
4873 }
4974
50- err := imagex .EnableServiceHttps (imagexService , service .ServiceId , domain .DomainName , addedCert .CertId )
51- if err != nil {
52- log .Printf ("%v" , err )
75+ setCertErr := retry .Do (func () error {
76+ retryErr := imagex .EnableServiceHttps (imagexService , service .ServiceId , domain .DomainName , addedCert .CertId )
77+ if retryErr != nil {
78+ return retryErr
79+ }
80+ return nil
81+ }, retry .Attempts (3 ), retry .Delay (time .Second * 5 ), retry .OnRetry (func (n uint , err error ) {
82+ log .Printf ("set cert for %s(%s):%s retry:%d err:%+v" , service .ServiceName , service .ServiceId , domain .DomainName , n , err )
83+ }))
84+ if setCertErr != nil {
85+ log .Printf ("%v" , setCertErr )
5386 continue
5487 }
5588
0 commit comments