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

graph

Browse Source
This commit is contained in:
A.Unger
2021-11-11 13:18:53 +01:00
parent 6391d94516
commit f118357a18
4 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/pkg/command/root.go
+15 -4
View File
@@ -66,7 +66,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)
}
@@ -78,9 +91,7 @@ type SutureService struct {
// NewSutureService creates a new graph.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service {
if (cfg.Graph.Log == shared.Log{}) {
cfg.Graph.Log = cfg.Log
}
cfg.Graph.Commons = cfg.Commons
return SutureService{
cfg: cfg.Graph,
}