unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 258 Wiki Activity

config: proper handle AllowFail option #191

Merged
vtolstov merged 1 commits from config-fix into v3 2023-03-14 13:24:38 +03:00
Conversation 0 Commits 1 Files Changed 1 +16 -8
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33a7feb970 - Show all commits

24
config/default.go
View File

@ -24,11 +24,20 @@ func (c *defaultConfig) Init(opts ...Option) error {
for _, o := range opts { for _, o := range opts {
o(&c.opts) o(&c.opts)
} }
if err := DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
if err := DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
return nil return nil
} }
func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error { func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
if err := DefaultBeforeLoad(ctx, c); err != nil { if err := DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err return err
} }
@ -51,21 +60,20 @@ func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
if !c.opts.AllowFail { if !c.opts.AllowFail {
return err return err
} }
return DefaultAfterLoad(ctx, c) if err = DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
} }
if err = fillValues(reflect.ValueOf(src), c.opts.StructTag); err == nil { if err = fillValues(reflect.ValueOf(src), c.opts.StructTag); err == nil {
err = mergo.Merge(dst, src, mopts...) err = mergo.Merge(dst, src, mopts...)
} }
if err != nil { if err != nil && !c.opts.AllowFail {
c.opts.Logger.Errorf(ctx, "default load error: %v", err) return err
if !c.opts.AllowFail {
return err
}
} }
if err := DefaultAfterLoad(ctx, c); err != nil { if err := DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err return err
} }