Revert "removed redundant ocis config parsing"

This reverts commit c700ccab1f.

ocis/pkg/command/accounts.go

@@ -25,6 +25,10 @@ func AccountsCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.Accounts),
 		},
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.Accounts.Commons = cfg.Commons
 			}

ocis/pkg/command/glauth.go

@@ -14,6 +14,10 @@ func GLAuthCommand(cfg *config.Config) *cli.Command {
 		Usage:    "Start glauth server",
 		Category: "Extensions",
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.GLAuth.Commons = cfg.Commons
 			}

ocis/pkg/command/health.go

@@ -14,6 +14,9 @@ func Health(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "health",
 		Usage: "Check health status",
+		Before: func(c *cli.Context) error {
+			return ParseConfig(c, cfg)
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

ocis/pkg/command/idp.go

@@ -17,6 +17,10 @@ func IDPCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.IDP),
 		},
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.IDP.Commons = cfg.Commons
 			}

ocis/pkg/command/ocs.go

@@ -17,6 +17,10 @@ func OCSCommand(cfg *config.Config) *cli.Command {
 		Usage:    "Start ocs server",
 		Category: "Extensions",
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.OCS.Commons = cfg.Commons
 			}

ocis/pkg/command/proxy.go

@@ -20,6 +20,10 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.Proxy),
 		},
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.Proxy.Commons = cfg.Commons
 			}

ocis/pkg/command/server.go

@@ -25,7 +25,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
 			}
 
-			return nil
+			return ParseConfig(c, cfg)
 		},
 		Action: func(c *cli.Context) error {
 

ocis/pkg/command/settings.go

@@ -20,6 +20,10 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.Settings),
 		},
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.Settings.Commons = cfg.Commons
 			}

ocis/pkg/command/store.go

@@ -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)
 		},

ocis/pkg/command/thumbnails.go

@@ -20,6 +20,10 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.Thumbnails),
 		},
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.Thumbnails.Commons = cfg.Commons
 			}

ocis/pkg/command/web.go

@@ -14,6 +14,10 @@ func WebCommand(cfg *config.Config) *cli.Command {
 		Usage:    "Start web server",
 		Category: "Extensions",
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.Web.Commons = cfg.Commons
 			}

ocis/pkg/command/webdav.go

@@ -21,6 +21,10 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.WebDAV),
 		},
 		Before: func(ctx *cli.Context) error {
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+
 			if cfg.Commons != nil {
 				cfg.WebDAV.Commons = cfg.Commons
 			}