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

new config framework in settings

Browse Source
This commit is contained in:
A.Unger
2021-11-08 14:00:25 +01:00
parent 51dc1715ce
commit 8f99fdc902
3 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ocis/pkg/command/settings.go
View File

@@ -5,15 +5,16 @@ package command
import (
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/owncloud/ocis/settings/pkg/command"
svcconfig "github.com/owncloud/ocis/settings/pkg/config"
"github.com/urfave/cli/v2"
)
// SettingsCommand is the entry point for the settings command.
func SettingsCommand(cfg *config.Config) *cli.Command {
var globalLog shared.Log
return &cli.Command{
Name: "settings",
Usage: "Start settings server",
@@ -22,35 +23,26 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
command.PrintVersion(cfg.Settings),
},
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 {
origCmd := command.Server(configureSettings(cfg))
// if accounts logging is empty in ocis.yaml
if (cfg.Settings.Log == shared.Log{}) && (globalLog != shared.Log{}) {
// we can safely inherit the global logging values.
cfg.Settings.Log = globalLog
}
origCmd := command.Server(cfg.Settings)
return handleOriginalAction(c, origCmd)
},
}
}
func configureSettings(cfg *config.Config) *svcconfig.Config {
cfg.Settings.Log.Level = cfg.Log.Level
cfg.Settings.Log.Pretty = cfg.Log.Pretty
cfg.Settings.Log.Color = cfg.Log.Color
cfg.Settings.Service.Version = version.String
if cfg.Tracing.Enabled {
cfg.Settings.Tracing.Enabled = cfg.Tracing.Enabled
cfg.Settings.Tracing.Type = cfg.Tracing.Type
cfg.Settings.Tracing.Endpoint = cfg.Tracing.Endpoint
cfg.Settings.Tracing.Collector = cfg.Tracing.Collector
}
if cfg.TokenManager.JWTSecret != "" {
cfg.Settings.TokenManager.JWTSecret = cfg.TokenManager.JWTSecret
}
return cfg.Settings
}
func init() {
register.AddCommand(SettingsCommand)
}