mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-26 07:28:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

sane common configurations

Browse Source
This commit is contained in:
A.Unger
2021-11-11 12:51:57 +01:00
parent 04d8ec86ab
commit aa67106e04
11 changed files with 72 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ocis/pkg/command/proxy.go
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/proxy/pkg/command"
"github.com/urfave/cli/v2"
@@ -13,8 +12,6 @@ import (
// 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",
@@ -26,15 +23,14 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
if err := ParseConfig(ctx, cfg); err != nil {
return err
}
globalLog = cfg.Log
if cfg.Commons != nil {
cfg.Proxy.Commons = cfg.Commons
}
return nil
},
Action: func(c *cli.Context) error {
// if proxy logging is empty in ocis.yaml
if (cfg.Proxy.Log == shared.Log{}) && (globalLog != shared.Log{}) {
// we can safely inherit the global logging values.
cfg.Proxy.Log = globalLog
}
origCmd := command.Server(cfg.Proxy)
return handleOriginalAction(c, origCmd)
},