made ocs compliant with shared.Commons

This commit is contained in:
A.Unger
2021-11-11 14:15:28 +01:00
parent 34840d62e3
commit 202e63bcb6
5 changed files with 31 additions and 45 deletions
-19
View File
@@ -4,10 +4,6 @@ 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/owncloud/ocis/ocs/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -26,8 +22,6 @@ 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, "/")
}
@@ -36,19 +30,6 @@ func Server(cfg *config.Config) *cli.Command {
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 {