Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: restructure error handling on polling manager #183

Merged
merged 3 commits into from
Nov 14, 2019
Merged

fix: restructure error handling on polling manager #183

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71c0486
fix: restructure error handling on polling manager
pawels-optimizely Nov 14, 2019
f065a2d
Merge branch 'master' into pawel/fix_polling_manager_error
Nov 14, 2019
5815047
Merge branch 'master' into pawel/fix_polling_manager_error
pawels-optimizely Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions pkg/config/polling_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,32 +89,30 @@ func InitialDatafile(datafile []byte) OptionFunc {
func (cm *PollingProjectConfigManager) SyncConfig(datafile []byte) {
var e error
var code int

closeMutex := func(e error) {
cm.err = e
cm.configLock.Unlock()
}

if len(datafile) == 0 {
datafile, code, e = cm.requester.Get()

if e != nil {
cmLogger.Error(fmt.Sprintf("request returned with http code=%d", code), e)
cm.err = nil
if cm.projectConfig == nil {
cm.err = e
}
cm.configLock.Lock()
closeMutex(e)
return
}
}

projectConfig, err := datafileprojectconfig.NewDatafileProjectConfig(datafile)

cm.configLock.Lock()
closeMutex := func() {
cm.err = nil
if cm.projectConfig == nil {
cm.err = err
}
cm.configLock.Unlock()
}

if err != nil {
cmLogger.Error("failed to create project config", err)
closeMutex()
closeMutex(err)
return
}

Expand All @@ -124,12 +122,12 @@ func (cm *PollingProjectConfigManager) SyncConfig(datafile []byte) {
}
if projectConfig.GetRevision() == previousRevision {
cmLogger.Debug(fmt.Sprintf("No datafile updates. Current revision number: %s", cm.projectConfig.GetRevision()))
closeMutex()
closeMutex(nil)
return
}
cmLogger.Debug(fmt.Sprintf("New datafile set with revision: %s. Old revision: %s", projectConfig.GetRevision(), previousRevision))
cm.projectConfig = projectConfig
closeMutex()
closeMutex(nil)

if cm.notificationCenter != nil {
projectConfigUpdateNotification := notification.ProjectConfigUpdateNotification{
Expand Down Expand Up @@ -182,7 +180,10 @@ func NewPollingProjectConfigManager(sdkKey string, pollingMangerOptions ...Optio
func (cm *PollingProjectConfigManager) GetConfig() (pkg.ProjectConfig, error) {
cm.configLock.RLock()
defer cm.configLock.RUnlock()
return cm.projectConfig, cm.err
if cm.projectConfig == nil {
return cm.projectConfig, cm.err
}
return cm.projectConfig, nil
}

// OnProjectConfigUpdate registers a handler for ProjectConfigUpdate notifications
Expand Down