mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-05 15:57:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove error form accounts' EnsureDefaults() function

Browse Source
This commit is contained in:
Willy Kloucek
2022-03-11 13:04:48 +01:00
parent 9a4737d3ed
commit c829dbe577
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/pkg/config/defaults/defaultconfig.go
View File

@@ -78,7 +78,7 @@ func DefaultConfig() *config.Config {
}
}
func EnsureDefaults(cfg *config.Config) error {
func EnsureDefaults(cfg *config.Config) {
// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
cfg.Log = &config.Log{
@@ -101,8 +101,6 @@ func EnsureDefaults(cfg *config.Config) error {
} else if cfg.Tracing == nil {
cfg.Tracing = &config.Tracing{}
}
return nil
}
func Sanitize(cfg *config.Config) {

5
accounts/pkg/config/parser/parse.go
View File

@@ -17,10 +17,7 @@ func ParseConfig(cfg *config.Config) error {
return err
}
err = defaults.EnsureDefaults(cfg)
if err != nil {
return err
}
defaults.EnsureDefaults(cfg)
// load all env variables relevant to the config in the current context.
if err := envdecode.Decode(cfg); err != nil {