mirror of
https://github.com/thegeeklab/wp-s3-action.git
synced 2024-11-10 04:40:38 +00:00
Move invalidate to the end for safety
This commit is contained in:
parent
d3dfcec164
commit
811766f556
14
main.go
14
main.go
@ -153,7 +153,7 @@ func (a *app) createSyncJobs() {
|
|||||||
action: "redirect",
|
action: "redirect",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (a.vargs.Delete) {
|
if a.vargs.Delete {
|
||||||
for _, r := range remote {
|
for _, r := range remote {
|
||||||
found := false
|
found := false
|
||||||
for _, l := range local {
|
for _, l := range local {
|
||||||
@ -189,6 +189,7 @@ func (a *app) runJobs() {
|
|||||||
client := a.client
|
client := a.client
|
||||||
jobChan := make(chan struct{}, maxConcurrent)
|
jobChan := make(chan struct{}, maxConcurrent)
|
||||||
results := make(chan *result, len(a.jobs))
|
results := make(chan *result, len(a.jobs))
|
||||||
|
var invalidateJob *job
|
||||||
|
|
||||||
fmt.Printf("Synchronizing with bucket \"%s\"\n", vargs.Bucket)
|
fmt.Printf("Synchronizing with bucket \"%s\"\n", vargs.Bucket)
|
||||||
for _, j := range a.jobs {
|
for _, j := range a.jobs {
|
||||||
@ -202,7 +203,8 @@ func (a *app) runJobs() {
|
|||||||
} else if j.action == "delete" {
|
} else if j.action == "delete" {
|
||||||
err = client.Delete(j.remote)
|
err = client.Delete(j.remote)
|
||||||
} else if j.action == "invalidateCloudFront" {
|
} else if j.action == "invalidateCloudFront" {
|
||||||
client.Invalidate(j.remote)
|
invalidateJob = &j
|
||||||
|
// err = client.Invalidate(j.remote)
|
||||||
} else {
|
} else {
|
||||||
err = nil
|
err = nil
|
||||||
}
|
}
|
||||||
@ -218,6 +220,14 @@ func (a *app) runJobs() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if invalidateJob != nil {
|
||||||
|
err := client.Invalidate(invalidateJob.remote)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("ERROR: failed to %s %s to %s: %+v\n", invalidateJob.action, invalidateJob.local, invalidateJob.remote, err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func debug(format string, args ...interface{}) {
|
func debug(format string, args ...interface{}) {
|
||||||
|
Loading…
Reference in New Issue
Block a user