3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-13 17:17:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix data race (#1851)

Browse source
This commit is contained in:
Caleb Doxsey 2021-02-02 16:19:33 -07:00 • committed by GitHub
parent 74ac23c980
commit 899076a06a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/config_source.go
View file

@ -44,6 +44,7 @@ type Source interface {
// A StaticSource always returns the same config. Useful for testing. // A StaticSource always returns the same config. Useful for testing.
type StaticSource struct { type StaticSource struct {
mu sync.Mutex
cfg *Config cfg *Config
lis []ChangeListener lis []ChangeListener
} }
@ -55,11 +56,17 @@ func NewStaticSource(cfg *Config) *StaticSource {
// GetConfig gets the config. // GetConfig gets the config.
func (src *StaticSource) GetConfig() *Config { func (src *StaticSource) GetConfig() *Config {
src.mu.Lock()
defer src.mu.Unlock()
return src.cfg return src.cfg
} }
// SetConfig sets the config. // SetConfig sets the config.
func (src *StaticSource) SetConfig(cfg *Config) { func (src *StaticSource) SetConfig(cfg *Config) {
src.mu.Lock()
defer src.mu.Unlock()
src.cfg = cfg src.cfg = cfg
for _, li := range src.lis { for _, li := range src.lis {
li(cfg) li(cfg)
@ -68,6 +75,9 @@ func (src *StaticSource) SetConfig(cfg *Config) {
// OnConfigChange is ignored for the StaticSource. // OnConfigChange is ignored for the StaticSource.
func (src *StaticSource) OnConfigChange(li ChangeListener) { func (src *StaticSource) OnConfigChange(li ChangeListener) {
src.mu.Lock()
defer src.mu.Unlock()
src.lis = append(src.lis, li) src.lis = append(src.lis, li)
} }