fix: race condition on sync mode

foomo · Oct 2, 2023 · 9b9fdad · 9b9fdad
1 parent 524dd9d
commit 9b9fdad
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/erm/templates/contentful_vo_lib.gotmpl b/erm/templates/contentful_vo_lib.gotmpl
@@ -615,6 +615,7 @@ func (cc *ContentfulClient) UpdateCache(ctx context.Context, contentTypes []stri
     ctxAtWork, cancel := context.WithTimeout(ctx, time.Second*time.Duration(cc.cacheUpdateTimeout))
 	defer cancel()
 	localOffline := cc.offline
+	isSync := cc.sync
 	cc.cacheMutex.sharedDataGcLock.RUnlock()
 
 	if localOffline {
@@ -632,7 +633,7 @@ func (cc *ContentfulClient) UpdateCache(ctx context.Context, contentTypes []stri
 			}
 		}
 	}
-	if cc.sync {
+	if isSync {
 		return cc.syncCache(ctxAtWork, contentTypes)
 	}
 	cc.cacheWorkerOnce.Do(func() {

diff --git a/main.go b/main.go
@@ -14,7 +14,7 @@ import (
 	"github.com/foomo/gocontentful/erm"
 )
 
-var VERSION = "v1.0.23"
+var VERSION = "v1.0.25"
 
 type contentfulRc struct {
 	ManagementToken string `json:"managementToken"`

diff --git a/test/testapi/gocontentfulvo.go b/test/testapi/gocontentfulvo.go
diff --git a/test/testapi/gocontentfulvobase.go b/test/testapi/gocontentfulvobase.go
diff --git a/test/testapi/gocontentfulvolib.go b/test/testapi/gocontentfulvolib.go
diff --git a/test/testapi/gocontentfulvolibbrand.go b/test/testapi/gocontentfulvolibbrand.go
diff --git a/test/testapi/gocontentfulvolibcategory.go b/test/testapi/gocontentfulvolibcategory.go
diff --git a/test/testapi/gocontentfulvolibproduct.go b/test/testapi/gocontentfulvolibproduct.go