made ocs compliant with shared.Commons

This commit is contained in:
A.Unger
2021-11-11 14:15:28 +01:00
parent 34840d62e3
commit 202e63bcb6
5 changed files with 31 additions and 45 deletions

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