Revert "removed redundant ocis config parsing"

This reverts commit c700ccab1f.
This commit is contained in:
A.Unger
2021-11-22 22:27:29 +01:00
parent c700ccab1f
commit 8797cf3b5a
12 changed files with 58 additions and 1 deletions
+18
View File
@@ -5,6 +5,7 @@ package command
import (
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/owncloud/ocis/store/pkg/command"
"github.com/urfave/cli/v2"
@@ -12,6 +13,8 @@ import (
// 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",
@@ -19,7 +22,22 @@ func StoreCommand(cfg *config.Config) *cli.Command {
Subcommands: []*cli.Command{
command.PrintVersion(cfg.Store),
},
Before: func(ctx *cli.Context) error {
if err := ParseConfig(ctx, cfg); err != nil {
return err
}
globalLog = cfg.Log
return nil
},
Action: func(c *cli.Context) error {
// 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)
},