From 0e7901b2fc42e09723c9965ce468c4d29a7cc3e7 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sat, 19 Dec 2020 23:24:25 +0300 Subject: [PATCH] update for micro changes Signed-off-by: Vasiliy Tolstov --- consul.go | 18 ++++++++++-------- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/consul.go b/consul.go index fbf684d..1da5c1d 100644 --- a/consul.go +++ b/consul.go @@ -82,24 +82,26 @@ func (c *consulConfig) Init(opts ...config.Option) error { func (c *consulConfig) 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 } } pair, _, err := c.cli.KV().Get(c.path, nil) - if err != nil { + if err != nil && !c.opts.AllowFail { return fmt.Errorf("consul path load error: %v", err) - } else if pair == nil { + } else if pair == nil && !c.opts.AllowFail { return fmt.Errorf("consul path not found %v", ErrPathNotExist) } - if err = c.opts.Codec.Unmarshal(pair.Value, c.opts.Struct); err != nil { - return err + if err == nil && pair != nil { + if err = c.opts.Codec.Unmarshal(pair.Value, c.opts.Struct); 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 } } @@ -109,13 +111,13 @@ func (c *consulConfig) Load(ctx context.Context) error { func (c *consulConfig) 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 } } diff --git a/go.mod b/go.mod index 7482371..14ebf03 100644 --- a/go.mod +++ b/go.mod @@ -6,5 +6,5 @@ require ( github.com/hashicorp/consul/api v1.8.0 github.com/hashicorp/go-hclog v0.15.0 github.com/pkg/errors v0.9.1 // indirect - github.com/unistack-org/micro/v3 v3.0.2-0.20201213102644-92aec349c3d4 + github.com/unistack-org/micro/v3 v3.0.2-0.20201219202205-150e8ad698bb ) diff --git a/go.sum b/go.sum index ebe4ce0..c327eaa 100644 --- a/go.sum +++ b/go.sum @@ -308,6 +308,8 @@ github.com/transip/gotransip v0.0.0-20190812104329-6d8d9179b66f/go.mod h1:i0f4R4 github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/unistack-org/micro/v3 v3.0.2-0.20201213102644-92aec349c3d4 h1:SmwEx/EYb7iUOdDZHiamtwRFfnhiZjtzmVdLZq+KQM0= github.com/unistack-org/micro/v3 v3.0.2-0.20201213102644-92aec349c3d4/go.mod h1:0DgOy4OdJxQCDER8YSKitZugd2+1bddrRSNfeooTHDc= +github.com/unistack-org/micro/v3 v3.0.2-0.20201219202205-150e8ad698bb h1:cJGF8j30idReDyjRCvEJN5waWCh/AKuiKEqLA8OLMlY= +github.com/unistack-org/micro/v3 v3.0.2-0.20201219202205-150e8ad698bb/go.mod h1:0DgOy4OdJxQCDER8YSKitZugd2+1bddrRSNfeooTHDc= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vultr/govultr v0.1.4/go.mod h1:9H008Uxr/C4vFNGLqKx232C206GL0PBHzOP0809bGNA= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=