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

zero: rm extra call on start (#4474)

Browse source
This commit is contained in:
Denis Mishin 2023-08-17 18:15:58 -04:00 • committed by Kenneth Jenkins
parent e0236d3737
commit e64e682853
1 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
internal/zero/bootstrap/bootstrap.go
View file

@ -42,7 +42,7 @@ func (svc *Source) Run(
svc.api = api svc.api = api
svc.fileCachePath = fileCachePath svc.fileCachePath = fileCachePath
svc.tryLoadInitial(ctx) svc.tryLoadFromFile(ctx)
eg, ctx := errgroup.WithContext(ctx) eg, ctx := errgroup.WithContext(ctx)
eg.Go(func() error { return svc.watchUpdates(ctx) }) eg.Go(func() error { return svc.watchUpdates(ctx) })
@ -70,6 +70,14 @@ func (svc *Source) updateLoop(ctx context.Context) error {
defer ticker.Stop() defer ticker.Stop()
for { for {
err := retry.Retry(ctx,
"update bootstrap", svc.updateAndSave,
retry.WithWatch("bootstrap config updated", svc.checkForUpdate, nil),
)
if err != nil {
return fmt.Errorf("update bootstrap config: %w", err)
}
ticker.Reset(svc.updateInterval.Load()) ticker.Reset(svc.updateInterval.Load())
select { select {
@ -78,14 +86,6 @@ func (svc *Source) updateLoop(ctx context.Context) error {
case <-svc.checkForUpdate: case <-svc.checkForUpdate:
case <-ticker.C: case <-ticker.C:
} }
err := retry.Retry(ctx,
"update bootstrap", svc.updateAndSave,
retry.WithWatch("bootstrap config updated", svc.checkForUpdate, nil),
)
if err != nil {
return fmt.Errorf("update bootstrap config: %w", err)
}
} }
} }
@ -116,15 +116,6 @@ func (svc *Source) updateAndSave(ctx context.Context) error {
return nil return nil
} }
func (svc *Source) tryLoadInitial(ctx context.Context) {
err := svc.updateAndSave(ctx)
if err != nil {
log.Ctx(ctx).Error().Err(err).Msg("failed to load bootstrap config")
svc.tryLoadFromFile(ctx)
return
}
}
func (svc *Source) tryLoadFromFile(ctx context.Context) { func (svc *Source) tryLoadFromFile(ctx context.Context) {
cfg, err := LoadBootstrapConfigFromFile(svc.fileCachePath, svc.fileCipher) cfg, err := LoadBootstrapConfigFromFile(svc.fileCachePath, svc.fileCipher)
if err != nil { if err != nil {