root/golib
1
0
Fork 0
mirror of https://github.com/therootcompany/golib.git synced 2026-11-04 06:55:00 +00:00
Code Issues Projects Releases Wiki Activity

fix(ippolicy): return empty evaluator on load failure

Browse Source
This commit is contained in:
AJ ONeal 2026-09-10 02:23:14 -06:00
parent 9a7a0f523c
commit 4b8425c1ac
No known key found for this signature in database
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/ippolicy/policy.go
View File

@ -119,14 +119,21 @@ func (p *Policy) Current() *Evaluator { return p.current.Load() }
// Refresh errors are returned while the previous evaluator is retained. // Refresh errors are returned while the previous evaluator is retained.
func (p *Policy) Load(ctx context.Context, wait bool) (*Evaluator, error) { func (p *Policy) Load(ctx context.Context, wait bool) (*Evaluator, error) {
if _, err := p.Revalidate(ctx); err != nil { if _, err := p.Revalidate(ctx); err != nil {
return p.Current(), err return p.lastGood(), err
} }
if p.loadedAt.Load() == nil || wait { if p.loadedAt.Load() == nil || wait {
if err := p.refresh.Wait(ctx); err != nil { if err := p.refresh.Wait(ctx); err != nil {
return p.Current(), err return p.lastGood(), err
} }
} }
return p.Current(), nil return p.lastGood(), nil
}
func (p *Policy) lastGood() *Evaluator {
if evaluator := p.Current(); evaluator != nil {
return evaluator
}
return &Evaluator{}
} }
func (p *Policy) Due(ctx context.Context) (bool, error) { func (p *Policy) Due(ctx context.Context) (bool, error) {