diff --git a/ocis/pkg/command/accounts.go b/ocis/pkg/command/accounts.go index 1cacd70d0..7597ae2a2 100644 --- a/ocis/pkg/command/accounts.go +++ b/ocis/pkg/command/accounts.go @@ -25,10 +25,6 @@ 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 } diff --git a/ocis/pkg/command/glauth.go b/ocis/pkg/command/glauth.go index c6baacfde..da059c0cf 100644 --- a/ocis/pkg/command/glauth.go +++ b/ocis/pkg/command/glauth.go @@ -14,10 +14,6 @@ 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 } diff --git a/ocis/pkg/command/health.go b/ocis/pkg/command/health.go index f293dbf8f..c5d46ceac 100644 --- a/ocis/pkg/command/health.go +++ b/ocis/pkg/command/health.go @@ -14,9 +14,6 @@ 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) diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go index 7b35c15ba..c6d9c86be 100644 --- a/ocis/pkg/command/idp.go +++ b/ocis/pkg/command/idp.go @@ -17,10 +17,6 @@ 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 } diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go index 17f2d927e..e53f01fa7 100644 --- a/ocis/pkg/command/ocs.go +++ b/ocis/pkg/command/ocs.go @@ -17,10 +17,6 @@ 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 } diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go index 321298689..570a45046 100644 --- a/ocis/pkg/command/proxy.go +++ b/ocis/pkg/command/proxy.go @@ -20,10 +20,6 @@ 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 } diff --git a/ocis/pkg/command/server.go b/ocis/pkg/command/server.go index 336a39e87..728ca9f85 100644 --- a/ocis/pkg/command/server.go +++ b/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 ParseConfig(c, cfg) + return nil }, Action: func(c *cli.Context) error { diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go index adb37be5b..b7fe0c09b 100644 --- a/ocis/pkg/command/settings.go +++ b/ocis/pkg/command/settings.go @@ -20,10 +20,6 @@ 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 } diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go index 639462117..b41c37b51 100644 --- a/ocis/pkg/command/store.go +++ b/ocis/pkg/command/store.go @@ -5,7 +5,6 @@ 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" @@ -13,8 +12,6 @@ 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", @@ -22,22 +19,7 @@ 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) }, diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go index 0562b5d61..480ca4dcb 100644 --- a/ocis/pkg/command/thumbnails.go +++ b/ocis/pkg/command/thumbnails.go @@ -20,10 +20,6 @@ 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 } diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go index c3f2df2ea..8085e0dd6 100644 --- a/ocis/pkg/command/web.go +++ b/ocis/pkg/command/web.go @@ -14,10 +14,6 @@ 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 } diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go index 0502642bb..2dee0070b 100644 --- a/ocis/pkg/command/webdav.go +++ b/ocis/pkg/command/webdav.go @@ -21,10 +21,6 @@ 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 }