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

fix merge

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-12-20 00:33:52 +03:00
parent e493535c3a
commit 5d62bf3f09
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
consul.go
View File

@ -96,11 +96,11 @@ func (c *consulConfig) Load(ctx context.Context) error {
}
if err == nil && pair != nil {
dst, err := config.Zero(c.opts.Struct)
src, err := config.Zero(c.opts.Struct)
if err == nil {
err = c.opts.Codec.Unmarshal(pair.Value, c.opts.Struct)
err = c.opts.Codec.Unmarshal(pair.Value, src)
if err == nil {
err = mergo.Merge(c.opts.Struct, dst, mergo.WithOverride, mergo.WithTypeCheck, mergo.WithAppendSlice)
err = mergo.Merge(c.opts.Struct, src, mergo.WithOverride, mergo.WithTypeCheck, mergo.WithAppendSlice)
}
}