mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-26 07:28:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

addded web to the new inheritance strategy

Browse Source
This commit is contained in:
A.Unger
2021-11-11 15:56:38 +01:00
parent 5f19300aaa
commit 4cecd9b5d2
5 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/pkg/command/root.go
View File

@@ -64,7 +64,19 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
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)
}
@@ -76,9 +88,7 @@ type SutureService struct {
// NewSutureService creates a new web.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service {
if (cfg.Web.Log == shared.Log{}) {
cfg.Web.Log = cfg.Log
}
cfg.Web.Commons = cfg.Commons
return SutureService{
cfg: cfg.Web,
}