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

rely on context from app

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2024-07-24 13:37:39 +02:00
parent a96203786f
commit 9d1515e8fc
26 changed files with 42 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/idm/pkg/command/resetpw.go
View File

@@ -40,12 +40,7 @@ func ResetPassword(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)
ctx, cancel := func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
ctx, cancel := context.WithCancel(c.Context)
defer cancel()
return resetPassword(ctx, logger, cfg, c.String("user-name"))

7
services/idm/pkg/command/server.go
View File

@@ -40,12 +40,7 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
logger = logging.Configure(cfg.Service.Name, cfg.Log)
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
ctx, cancel = context.WithCancel(c.Context)
)
defer cancel()