unistack-org/micro-config-consul
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

config: proper handle AllowFail option

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2023-03-14 13:41:44 +03:00
parent e2e19af94b
commit 5da1e0ea33
3 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
consul.go
View File

@@ -27,7 +27,11 @@ func (c *consulConfig) Init(opts ...config.Option) error {
o(&c.opts)
}
if c.opts.Codec == nil {
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
if c.opts.Codec == nil && !c.opts.AllowFail {
return config.ErrCodecMissing
}
@@ -67,22 +71,15 @@ func (c *consulConfig) Init(opts ...config.Option) error {
*/
}
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil {
return err
}
cli, err := api.NewClient(cfg)
if err != nil {
c.opts.Logger.Errorf(c.opts.Context, "consul init err: %v", err)
if !c.opts.AllowFail {
return err
}
if err != nil && !c.opts.AllowFail {
return err
}
c.cli = cli
c.path = path
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil {
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
@@ -90,18 +87,20 @@ func (c *consulConfig) Init(opts ...config.Option) error {
}
func (c *consulConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
path := c.path
options := config.NewLoadOptions(opts...)
if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
path := c.path
if options.Context != nil {
if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" {
path = v
}
}
if err := config.DefaultBeforeLoad(ctx, c); err != nil {
return err
}
pair, _, err := c.cli.KV().Get(path, nil)
if err != nil {
err = fmt.Errorf("consul path %s load error: %w", path, err)
@@ -109,12 +108,12 @@ func (c *consulConfig) Load(ctx context.Context, opts ...config.LoadOption) erro
err = fmt.Errorf("consul path %s load error: not found", path)
}
if err != nil {
c.opts.Logger.Error(c.opts.Context, err)
if !c.opts.AllowFail {
return err
}
return config.DefaultAfterLoad(ctx, c)
if err != nil && !c.opts.AllowFail {
return err
}
if err = config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
mopts := []func(*mergo.Config){mergo.WithTypeCheck}
@@ -138,14 +137,11 @@ func (c *consulConfig) Load(ctx context.Context, opts ...config.LoadOption) erro
}
}
if err != nil {
c.opts.Logger.Errorf(c.opts.Context, "consul load err: %v", err)
if !c.opts.AllowFail {
return err
}
if err != nil && !c.opts.AllowFail {
return err
}
if err := config.DefaultAfterLoad(ctx, c); err != nil {
if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
@@ -153,31 +149,30 @@ func (c *consulConfig) Load(ctx context.Context, opts ...config.LoadOption) erro
}
func (c *consulConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
path := c.path
options := config.NewSaveOptions(opts...)
if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
return err
}
path := c.path
if options.Context != nil {
if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" {
path = v
}
}
if err := config.DefaultBeforeSave(ctx, c); err != nil {
return err
}
buf, err := c.opts.Codec.Marshal(c.opts.Struct)
if err == nil {
_, err = c.cli.KV().Put(&api.KVPair{Key: path, Value: buf}, nil)
}
if err != nil {
c.opts.Logger.Errorf(c.opts.Context, "consul path %s save error: %v", path, err)
if !c.opts.AllowFail {
return fmt.Errorf("consul path %s save error: %v", path, err)
}
if err != nil && !c.opts.AllowFail {
return fmt.Errorf("consul path %s save error: %v", path, err)
}
if err := config.DefaultAfterSave(ctx, c); err != nil {
if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
return err
}