new config framework in graph

This commit is contained in:
A.Unger
2021-11-08 13:50:52 +01:00
parent 3d90b21e3b
commit 6da95d3ddd
2 changed files with 30 additions and 2 deletions

View File

@@ -4,6 +4,8 @@ import (
"context"
"os"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/thejerf/suture/v4"
"github.com/owncloud/ocis/graph/pkg/config"
@@ -76,7 +78,9 @@ type SutureService struct {
// NewSutureService creates a new graph.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service {
cfg.Graph.Log = cfg.Log
if (cfg.Accounts.Log == shared.Log{}) {
cfg.Accounts.Log = cfg.Log
}
return SutureService{
cfg: cfg.Graph,
}

View File

@@ -4,6 +4,10 @@ import (
"context"
"strings"
gofig "github.com/gookit/config/v2"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/oklog/run"
"github.com/owncloud/ocis/graph/pkg/config"
"github.com/owncloud/ocis/graph/pkg/metrics"
@@ -20,11 +24,31 @@ func Server(cfg *config.Config) *cli.Command {
Name: "server",
Usage: "Start integrated server",
Before: func(ctx *cli.Context) error {
// remember shared logging info to prevent empty overwrites
inLog := cfg.Log
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
}
return ParseConfig(ctx, cfg)
if err := ParseConfig(ctx, cfg); err != nil {
return err
}
if (cfg.Log == shared.Log{}) && (inLog != shared.Log{}) {
// set the default to the parent config
cfg.Log = inLog
// and parse the environment
conf := &gofig.Config{}
conf.LoadOSEnv(config.GetEnv(), false)
bindings := config.StructMappings(cfg)
if err := ociscfg.BindEnv(conf, bindings); err != nil {
return err
}
}
return nil
},
Action: func(c *cli.Context) error {
logger := NewLogger(cfg)