mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-25 23:19:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix dead code logic

Browse Source
This commit is contained in:
A.Unger
2021-11-04 14:19:41 +01:00
parent cfe1ac30af
commit a76ad08d12
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
accounts/pkg/command/server.go
View File

@@ -23,7 +23,6 @@ func Server(cfg *config.Config) *cli.Command {
Usage: "Start ocis accounts service",
Description: "uses an LDAP server as the storage backend",
Before: func(ctx *cli.Context) error {
logger := NewLogger(cfg)
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
}
@@ -32,17 +31,20 @@ func Server(cfg *config.Config) *cli.Command {
// When running on single binary mode the before hook from the root command won't get called. We manually
// call this before hook from ocis command, so the configuration can be loaded.
return ParseConfig(ctx, cfg)
if origins := ctx.StringSlice("cors-allowed-origins"); len(origins) != 0 {
cfg.HTTP.CORS.AllowedOrigins = origins
if err := ParseConfig(ctx, cfg); err != nil {
return err
}
if methods := ctx.StringSlice("cors-allowed-methods"); len(methods) != 0 {
cfg.HTTP.CORS.AllowedMethods = methods
}
if headers := ctx.StringSlice("cors-allowed-headers"); len(headers) != 0 {
cfg.HTTP.CORS.AllowedOrigins = headers
}
logger.Debug().Str("service", "accounts").Msg("ignoring config file parsing when running supervised")
// TODO(this is not in the cli context anymore)
//if origins := ctx.StringSlice("cors-allowed-origins"); len(origins) != 0 {
// cfg.HTTP.CORS.AllowedOrigins = origins
//}
//if methods := ctx.StringSlice("cors-allowed-methods"); len(methods) != 0 {
// cfg.HTTP.CORS.AllowedMethods = methods
//}
//if headers := ctx.StringSlice("cors-allowed-headers"); len(headers) != 0 {
// cfg.HTTP.CORS.AllowedOrigins = headers
//}
return nil
},
Action: func(c *cli.Context) error {

6
graph/pkg/command/server.go
View File

@@ -22,15 +22,15 @@ func Server(cfg *config.Config) *cli.Command {
Usage: "Start integrated server",
Flags: flagset.ServerWithConfig(cfg),
Before: func(ctx *cli.Context) error {
logger := NewLogger(cfg)
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
}
// When running on single binary mode the before hook from the root command won't get called. We manually
// call this before hook from ocis command, so the configuration can be loaded.
return ParseConfig(ctx, cfg)
logger.Debug().Str("service", "graph").Msg("ignoring config file parsing when running supervised")
if err := ParseConfig(ctx, cfg); err != nil {
return err
}
return nil
},
Action: func(c *cli.Context) error {