mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

ensure, that each config is only parsed once

Browse Source
This commit is contained in:
Willy Kloucek
2022-01-03 19:08:11 +01:00
parent e37eff7dc8
commit 11466c5f9a
38 changed files with 70 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/pkg/command/root.go
View File

@@ -5,7 +5,6 @@ import (
"os"
"github.com/owncloud/ocis/accounts/pkg/config"
"github.com/owncloud/ocis/accounts/pkg/config/parser"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/thejerf/suture/v4"
@@ -35,11 +34,8 @@ func GetCommands(cfg *config.Config) cli.Commands {
// Execute is the entry point for the ocis-accounts command.
func Execute(cfg *config.Config) error {
app := clihelper.DefaultApp(&cli.App{
Name: "ocis-accounts",
Usage: "Provide accounts and groups for oCIS",
Before: func(c *cli.Context) error {
return parser.ParseConfig(cfg)
},
Name: "ocis-accounts",
Usage: "Provide accounts and groups for oCIS",
Commands: GetCommands(cfg),
})

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

@@ -23,12 +23,8 @@ func Server(cfg *config.Config) *cli.Command {
Name: "server",
Usage: "Start ocis accounts service",
Description: "uses an LDAP server as the storage backend",
Before: func(ctx *cli.Context) error {
if err := parser.ParseConfig(cfg); err != nil {
return err
}
return nil
Before: func(c *cli.Context) error {
return parser.ParseConfig(cfg)
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)