Skip to content

Commit

Permalink
Merge pull request #48 from foomo/config-override
Browse files Browse the repository at this point in the history
feat: set override
  • Loading branch information
franklinkim committed Dec 1, 2023
2 parents 22bbc72 + 3354115 commit f19376c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions internal/config/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func Load(l log.Logger) error {
// continue
} else if err != nil {
return err
} else if err := mergo.Merge(&settings, c.AllSettings(), mergo.WithAppendSlice); err != nil {
} else if err := mergo.Merge(&settings, c.AllSettings(), mergo.WithOverride, mergo.WithAppendSlice); err != nil {
return err
} else {
l.Debug("using root config file:", c.ConfigFileUsed())
Expand All @@ -40,7 +40,7 @@ func Load(l log.Logger) error {
// continue
} else if err != nil {
return err
} else if err := mergo.Merge(&settings, c.AllSettings(), mergo.WithAppendSlice); err != nil {
} else if err := mergo.Merge(&settings, c.AllSettings(), mergo.WithOverride, mergo.WithAppendSlice); err != nil {
return err
} else {
l.Debug("using config file:", c.ConfigFileUsed())
Expand All @@ -56,7 +56,7 @@ func Load(l log.Logger) error {
// continue
} else if err != nil {
return err
} else if err := mergo.Merge(&settings, c.AllSettings(), mergo.WithAppendSlice); err != nil {
} else if err := mergo.Merge(&settings, c.AllSettings(), mergo.WithOverride, mergo.WithAppendSlice); err != nil {
return err
} else {
l.Debug("using override config file:", c.ConfigFileUsed())
Expand Down

0 comments on commit f19376c

Please sign in to comment.