addded web to the new inheritance strategy

This commit is contained in:
A.Unger
2021-11-11 15:56:38 +01:00
parent 5f19300aaa
commit 4cecd9b5d2
5 changed files with 38 additions and 53 deletions

View File

@@ -2,7 +2,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/web/pkg/command"
"github.com/urfave/cli/v2"
@@ -10,8 +9,6 @@ import (
// WebCommand is the entrypoint for the web command.
func WebCommand(cfg *config.Config) *cli.Command {
var globalLog shared.Log
return &cli.Command{
Name: "web",
Usage: "Start web server",
@@ -21,16 +18,13 @@ func WebCommand(cfg *config.Config) *cli.Command {
return err
}
globalLog = cfg.Log
if cfg.Commons != nil {
cfg.Web.Commons = cfg.Commons
}
return nil
},
Action: func(c *cli.Context) error {
// if accounts logging is empty in ocis.yaml
if (cfg.Web.Log == shared.Log{}) && (globalLog != shared.Log{}) {
// we can safely inherit the global logging values.
cfg.Web.Log = globalLog
}
origCmd := command.Server(cfg.Web)
return handleOriginalAction(c, origCmd)
},