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

config: fix hot-reloading (#1820)

Browse source
This commit is contained in:
Caleb Doxsey 2021-01-25 12:20:41 -07:00 • committed by GitHub
parent 19d78cb844
commit 979e8f9cec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
config/config_source.go
View file

@ -2,7 +2,6 @@ package config
import (
"crypto/sha256"
"encoding/hex"
"io/ioutil"
"sync"
@ -124,7 +123,6 @@ type FileWatcherSource struct {
mu sync.RWMutex
computedConfig *Config
version string
ChangeDispatcher
}
@ -183,16 +181,11 @@ func (src *FileWatcherSource) check(cfg *Config) {
}
}
version := hex.EncodeToString(h.Sum(nil))
if src.version != version {
src.version = version
// update the computed config
src.computedConfig = cfg.Clone()
src.computedConfig.Options.Certificates = nil
_ = src.computedConfig.Options.Validate()
// update the computed config
src.computedConfig = cfg.Clone()
src.computedConfig.Options.Certificates = nil
_ = src.computedConfig.Options.Validate()
// trigger a change
src.Trigger(src.computedConfig)
}
// trigger a change
src.Trigger(src.computedConfig)
}