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

fileutil: reimplement file watcher (#5498)

Browse source 
* remove context, add close

* update tests

* cleanup

* fileutil: reimplement file watcher

* remove test, simplify tree set code, fix data race
This commit is contained in:
Caleb Doxsey 2025-02-26 09:21:06 -07:00 • committed by GitHub
parent 1b2618170d
commit 1f30dead31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 332 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/config_source.go
View file

@ -136,12 +136,13 @@ func NewFileOrEnvironmentSource(
watcher: fileutil.NewWatcher(),
config: cfg,
}
context.AfterFunc(ctx, func() { src.watcher.Close() })
if configFile != "" {
if cfg.Options.IsRuntimeFlagSet(RuntimeFlagConfigHotReload) {
src.watcher.Watch(ctx, []string{configFile})
src.watcher.Watch([]string{configFile})
} else {
log.Ctx(ctx).Info().Msg("hot reload disabled")
src.watcher.Watch(ctx, nil)
src.watcher.Watch(nil)
}
}
ch := src.watcher.Bind()
@ -215,6 +216,7 @@ func NewFileWatcherSource(ctx context.Context, underlying Source) *FileWatcherSo
watcher: fileutil.NewWatcher(),
cfg: cfg,
}
context.AfterFunc(ctx, func() { src.watcher.Close() })
ch := src.watcher.Bind()
go func() {
@ -241,9 +243,9 @@ func (src *FileWatcherSource) GetConfig() *Config {
func (src *FileWatcherSource) onConfigChange(ctx context.Context, cfg *Config) {
// update the file watcher with paths from the config
if cfg.Options.IsRuntimeFlagSet(RuntimeFlagConfigHotReload) {
src.watcher.Watch(ctx, getAllConfigFilePaths(cfg))
src.watcher.Watch(getAllConfigFilePaths(cfg))
} else {
src.watcher.Watch(ctx, nil)
src.watcher.Watch(nil)
}
src.mu.Lock()