new config framework in accounts

ocis/pkg/command/accounts.go

@@ -6,12 +6,15 @@ package command
 import (
 	"github.com/owncloud/ocis/accounts/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/shared"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 
 // AccountsCommand is the entrypoint for the accounts command.
 func AccountsCommand(cfg *config.Config) *cli.Command {
+	var globalLog shared.Log
+
 	return &cli.Command{
 		Name:     "accounts",
 		Usage:    "Start accounts server",
@@ -25,10 +28,20 @@ func AccountsCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.Accounts),
 		},
 		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 {
-			cfg.Accounts.Log = cfg.Log
+			// if accounts logging is empty in ocis.yaml
+			if (cfg.Accounts.Log == shared.Log{}) && (globalLog != shared.Log{}) {
+				// we can safely inherit the global logging values.
+				cfg.Accounts.Log = globalLog
+			}
 			origCmd := command.Server(cfg.Accounts)
 			return handleOriginalAction(c, origCmd)
 		},

ocis/pkg/command/proxy.go

@@ -11,10 +11,10 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var globalLog shared.Log
-
 // ProxyCommand is the entry point for the proxy command.
 func ProxyCommand(cfg *config.Config) *cli.Command {
+	var globalLog shared.Log
+
 	return &cli.Command{
 		Name:     "proxy",
 		Usage:    "Start proxy server",