mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

losing my mind

Browse Source
This commit is contained in:
A.Unger
2021-11-11 15:12:37 +01:00
parent a29f10e764
commit 3580e16771
21 changed files with 59 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
settings/pkg/command/root.go
View File

@@ -71,7 +71,20 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
if err != nil {
return err
}
conf.LoadOSEnv(config.GetEnv(), false)
// 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 = &shared.Log{
Level: cfg.Commons.Log.Level,
Pretty: cfg.Commons.Log.Pretty,
Color: cfg.Commons.Log.Color,
File: cfg.Commons.Log.File,
}
} else if cfg.Log == nil && cfg.Commons == nil {
cfg.Log = &shared.Log{}
}
conf.LoadOSEnv(config.GetEnv(cfg), false)
bindings := config.StructMappings(cfg)
return ociscfg.BindEnv(conf, bindings)
}
@@ -83,9 +96,7 @@ type SutureService struct {
// NewSutureService creates a new settings.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service {
if (cfg.Settings.Log == shared.Log{}) {
cfg.Settings.Log = cfg.Log
}
cfg.Settings.Commons = cfg.Commons
return SutureService{
cfg: cfg.Settings,
}