Merge branch 'master' into master
Some checks failed
automerge / automerge (pull_request) Failing after 19s
dependabot-automerge / automerge (pull_request) Has been skipped
lint / lint (pull_request) Successful in 37s
autoapprove / autoapprove (pull_request) Failing after 35s
test / test (pull_request) Successful in 12m47s

This commit is contained in:
Василий Толстов 2024-12-12 10:25:57 +03:00
commit d755c3fcc8

8
env.go
View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"dario.cat/mergo" "dario.cat/mergo"
"go.unistack.org/micro/v4/config" "go.unistack.org/micro/v4/config"
"go.unistack.org/micro/v4/options" "go.unistack.org/micro/v4/options"
rutil "go.unistack.org/micro/v4/util/reflect" rutil "go.unistack.org/micro/v4/util/reflect"
@ -25,8 +25,12 @@ func (c *envConfig) Options() config.Options {
} }
func (c *envConfig) Init(opts ...options.Option) error { func (c *envConfig) Init(opts ...options.Option) error {
var err error
for _, o := range opts { for _, o := range opts {
o(&c.opts) if err = o(&c.opts); err != nil {
return err
}
} }
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail { if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {