removed redundant ocis config parsing

This commit is contained in:
A.Unger
2021-11-22 22:11:06 +01:00
parent 45a559f707
commit c700ccab1f
12 changed files with 1 additions and 58 deletions
-4
View File
@@ -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
}
-4
View File
@@ -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
}
-3
View File
@@ -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)
-4
View File
@@ -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
}
-4
View File
@@ -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
}
-4
View File
@@ -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
}
+1 -1
View File
@@ -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 {
-4
View File
@@ -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
}
-18
View File
@@ -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)
},
-4
View File
@@ -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
}
-4
View File
@@ -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
}
-4
View File
@@ -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
}