diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go index b37d10a769..6394621179 100644 --- a/ocis/pkg/command/store.go +++ b/ocis/pkg/command/store.go @@ -5,15 +5,16 @@ package command import ( "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/ocis-pkg/shared" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/store/pkg/command" - svcconfig "github.com/owncloud/ocis/store/pkg/config" "github.com/urfave/cli/v2" ) // StoreCommand is the entrypoint for the ocs command. func StoreCommand(cfg *config.Config) *cli.Command { + var globalLog shared.Log + return &cli.Command{ Name: "store", Usage: "Start a go-micro store", @@ -22,31 +23,27 @@ func StoreCommand(cfg *config.Config) *cli.Command { command.PrintVersion(cfg.Store), }, Before: func(ctx *cli.Context) error { - return ParseConfig(ctx, cfg) + if err := ParseConfig(ctx, cfg); err != nil { + return err + } + + globalLog = cfg.Log + + return nil }, Action: func(c *cli.Context) error { - origCmd := command.Server(configureStore(cfg)) + // if accounts logging is empty in ocis.yaml + if (cfg.Store.Log == shared.Log{}) && (globalLog != shared.Log{}) { + // we can safely inherit the global logging values. + cfg.Store.Log = globalLog + } + + origCmd := command.Server(cfg.Store) return handleOriginalAction(c, origCmd) }, } } -func configureStore(cfg *config.Config) *svcconfig.Config { - cfg.Store.Log.Level = cfg.Log.Level - cfg.Store.Log.Pretty = cfg.Log.Pretty - cfg.Store.Log.Color = cfg.Log.Color - cfg.Store.Service.Version = version.String - - if cfg.Tracing.Enabled { - cfg.Store.Tracing.Enabled = cfg.Tracing.Enabled - cfg.Store.Tracing.Type = cfg.Tracing.Type - cfg.Store.Tracing.Endpoint = cfg.Tracing.Endpoint - cfg.Store.Tracing.Collector = cfg.Tracing.Collector - } - - return cfg.Store -} - func init() { register.AddCommand(StoreCommand) } diff --git a/store/pkg/command/root.go b/store/pkg/command/root.go index 07425fa54f..6b6ef33c1e 100644 --- a/store/pkg/command/root.go +++ b/store/pkg/command/root.go @@ -4,6 +4,8 @@ import ( "context" "os" + "github.com/owncloud/ocis/ocis-pkg/shared" + ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/version" @@ -84,7 +86,9 @@ type SutureService struct { // NewSutureService creates a new store.SutureService func NewSutureService(cfg *ociscfg.Config) suture.Service { - cfg.Store.Log = cfg.Log + if (cfg.Accounts.Log == shared.Log{}) { + cfg.Accounts.Log = cfg.Log + } return SutureService{ cfg: cfg.Store, } diff --git a/store/pkg/command/server.go b/store/pkg/command/server.go index a8677eb169..6227198742 100644 --- a/store/pkg/command/server.go +++ b/store/pkg/command/server.go @@ -3,6 +3,10 @@ package command import ( "context" + 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/store/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -21,7 +25,26 @@ func Server(cfg *config.Config) *cli.Command { Name: "server", Usage: "Start integrated server", Before: func(ctx *cli.Context) error { - return ParseConfig(ctx, cfg) + // remember shared logging info to prevent empty overwrites + inLog := cfg.Log + 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)