unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

config: improve and export helper func

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2020-12-19 23:22:05 +03:00
parent 035a84e696
commit 150e8ad698
4 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/default.go
View File

@@ -24,19 +24,19 @@ func (c *defaultConfig) Init(opts ...Option) error {
func (c *defaultConfig) Load(ctx context.Context) error {
for _, fn := range c.opts.BeforeLoad {
if err := fn(ctx, c); err != nil {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
}
valueOf := reflect.ValueOf(c.opts.Struct)
if err := c.fillValues(ctx, valueOf); err != nil {
if err := c.fillValues(ctx, valueOf); err != nil && !c.opts.AllowFail {
return err
}
for _, fn := range c.opts.AfterLoad {
if err := fn(ctx, c); err != nil {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
}
@@ -45,6 +45,9 @@ func (c *defaultConfig) Load(ctx context.Context) error {
}
func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val string) error {
if !IsEmpty(value) {
return nil
}
switch value.Kind() {
case reflect.Map:
t := value.Type()
@@ -221,13 +224,13 @@ func (c *defaultConfig) fillValues(ctx context.Context, valueOf reflect.Value) e
func (c *defaultConfig) Save(ctx context.Context) error {
for _, fn := range c.opts.BeforeSave {
if err := fn(ctx, c); err != nil {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
}
for _, fn := range c.opts.AfterSave {
if err := fn(ctx, c); err != nil {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
}