minor tweaks and improvements #75

Merged
vtolstov merged 3 commits from fix into v3 2023-03-15 00:55:18 +03:00
2 changed files with 48 additions and 4 deletions
Showing only changes of commit d6cba44b60 - Show all commits

46
flag.go
View File

@ -43,13 +43,26 @@ func (c *flagConfig) Init(opts ...config.Option) error {
for _, o := range opts { for _, o := range opts {
o(&c.opts) o(&c.opts)
} }
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
c.configure() c.configure()
fields, err := rutil.StructFields(c.opts.Struct) fields, err := rutil.StructFields(c.opts.Struct)
if err != nil { if err != nil {
if !c.opts.AllowFail {
return err return err
} }
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
return nil
}
for _, sf := range fields { for _, sf := range fields {
tf, ok := sf.Field.Tag.Lookup(c.opts.StructTag) tf, ok := sf.Field.Tag.Lookup(c.opts.StructTag)
if !ok { if !ok {
@ -84,10 +97,13 @@ func (c *flagConfig) Init(opts ...config.Option) error {
} }
if err != nil { if err != nil {
c.opts.Logger.Errorf(c.opts.Context, "flag init error: %v", err)
if !c.opts.AllowFail { if !c.opts.AllowFail {
return err return err
} }
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
return nil return nil
} }
@ -120,26 +136,52 @@ func (c *flagConfig) Init(opts ...config.Option) error {
err = c.flagMap(sf.Value, fn, fv, fd) err = c.flagMap(sf.Value, fn, fv, fd)
} }
if err != nil { if err != nil {
c.opts.Logger.Errorf(c.opts.Context, "flag init error: %v", err)
if !c.opts.AllowFail { if !c.opts.AllowFail {
return err return err
} }
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
return nil return nil
} }
} }
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
return nil return nil
} }
func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error { func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
options := config.NewLoadOptions(opts...) options := config.NewLoadOptions(opts...)
_ = options _ = options
if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
// TODO: allow merge, append and so // TODO: allow merge, append and so
flag.Parse() flag.Parse()
return nil return nil
} }
func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error { func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
return nil return nil
} }

4
go.mod
View File

@ -1,5 +1,7 @@
module go.unistack.org/micro-config-flag/v3 module go.unistack.org/micro-config-flag/v3
go 1.16 go 1.18
require go.unistack.org/micro/v3 v3.10.16 require go.unistack.org/micro/v3 v3.10.16
require github.com/imdario/mergo v0.3.13 // indirect