new config framework in idp
This commit is contained in:
+15
-2
@@ -3,12 +3,15 @@ package command
|
||||
import (
|
||||
"github.com/owncloud/ocis/idp/pkg/command"
|
||||
"github.com/owncloud/ocis/ocis-pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-pkg/shared"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/urfave/cli/v2"
|
||||
)
|
||||
|
||||
// IDPCommand is the entrypoint for the idp command.
|
||||
func IDPCommand(cfg *config.Config) *cli.Command {
|
||||
var globalLog shared.Log
|
||||
|
||||
return &cli.Command{
|
||||
Name: "idp",
|
||||
Usage: "Start idp server",
|
||||
@@ -17,11 +20,21 @@ func IDPCommand(cfg *config.Config) *cli.Command {
|
||||
command.PrintVersion(cfg.IDP),
|
||||
},
|
||||
Before: func(ctx *cli.Context) error {
|
||||
return ParseConfig(ctx, cfg)
|
||||
if err := ParseConfig(ctx, cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
globalLog = cfg.Log
|
||||
|
||||
return nil
|
||||
},
|
||||
Action: func(c *cli.Context) error {
|
||||
// if idp logging is empty in ocis.yaml
|
||||
if (cfg.IDP.Log == shared.Log{}) && (globalLog != shared.Log{}) {
|
||||
// we can safely inherit the global logging values.
|
||||
cfg.IDP.Log = globalLog
|
||||
}
|
||||
idpCommand := command.Server(cfg.IDP)
|
||||
|
||||
if err := idpCommand.Before(c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user