foomo/gocontentful
1
0
Fork 0
mirror of https://github.com/foomo/gocontentful.git synced 2025-10-16 12:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: race condition on sync mode

Browse Source
This commit is contained in:
Cristian Vidmar 2023-10-02 17:50:10 +02:00
parent 524dd9d61b
commit 9b9fdad2cd
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erm/templates/contentful_vo_lib.gotmpl
View File

@ -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() {

2
main.go
View File

@ -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"`

2
test/testapi/gocontentfulvo.go
View File

@ -1,4 +1,4 @@
// Code generated by https://github.com/foomo/gocontentful v1.0.23 - DO NOT EDIT.
// Code generated by https://github.com/foomo/gocontentful v1.0.24 - DO NOT EDIT.
package testapi
import (

2
test/testapi/gocontentfulvobase.go
View File

@ -1,4 +1,4 @@
// Code generated by https://github.com/foomo/gocontentful v1.0.23 - DO NOT EDIT.
// Code generated by https://github.com/foomo/gocontentful v1.0.24 - DO NOT EDIT.
package testapi
import "github.com/foomo/contentful"

5
test/testapi/gocontentfulvolib.go
View File

@ -1,4 +1,4 @@
// Code generated by https://github.com/foomo/gocontentful v1.0.23 - DO NOT EDIT.
// Code generated by https://github.com/foomo/gocontentful v1.0.24 - DO NOT EDIT.
package testapi
import (
@ -649,6 +649,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 {
@ -666,7 +667,7 @@ func (cc *ContentfulClient) UpdateCache(ctx context.Context, contentTypes []stri
}
}
}
if cc.sync {
if isSync {
return cc.syncCache(ctxAtWork, contentTypes)
}
cc.cacheWorkerOnce.Do(func() {

2
test/testapi/gocontentfulvolibbrand.go
View File

@ -1,4 +1,4 @@
// Code generated by https://github.com/foomo/gocontentful v1.0.23 - DO NOT EDIT.
// Code generated by https://github.com/foomo/gocontentful v1.0.24 - DO NOT EDIT.
package testapi
import (

2
test/testapi/gocontentfulvolibcategory.go
View File

@ -1,4 +1,4 @@
// Code generated by https://github.com/foomo/gocontentful v1.0.23 - DO NOT EDIT.
// Code generated by https://github.com/foomo/gocontentful v1.0.24 - DO NOT EDIT.
package testapi
import (

2
test/testapi/gocontentfulvolibproduct.go
View File

@ -1,4 +1,4 @@
// Code generated by https://github.com/foomo/gocontentful v1.0.23 - DO NOT EDIT.
// Code generated by https://github.com/foomo/gocontentful v1.0.24 - DO NOT EDIT.
package testapi
import (