mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-04 23:54:03 -04: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/activitylog/pkg/command/server.go
View File

@@ -61,12 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
}
gr := run.Group{}
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)
mtrcs := metrics.New()
mtrcs.BuildInfo.WithLabelValues(version.GetString()).Set(1)

9
services/antivirus/pkg/command/server.go
View File

@@ -29,13 +29,8 @@ func Server(cfg *config.Config) *cli.Command {
Action: func(c *cli.Context) error {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
logger = log.NewLogger(
ctx, cancel = context.WithCancel(c.Context)
logger = log.NewLogger(
log.Name(cfg.Service.Name),
log.Level(cfg.Log.Level),
log.Pretty(cfg.Log.Pretty),

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

@@ -34,12 +34,7 @@ func Server(cfg *config.Config) *cli.Command {
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()

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

@@ -62,12 +62,7 @@ func Server(cfg *config.Config) *cli.Command {
}
gr := run.Group{}
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)
mtrcs := metrics.New()
mtrcs.BuildInfo.WithLabelValues(version.GetString()).Set(1)

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

@@ -36,12 +36,7 @@ func Server(cfg *config.Config) *cli.Command {
}
gr := run.Group{}
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()
// prepare components

9
services/eventhistory/pkg/command/server.go
View File

@@ -47,13 +47,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
m = metrics.New()
ctx, cancel = context.WithCancel(c.Context)
m = metrics.New()
)
defer cancel()

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

@@ -35,12 +35,7 @@ func Server(cfg *config.Config) *cli.Command {
}
gr := run.Group{}
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)
mtrcs := metrics.New()
defer cancel()

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()

9
services/idp/pkg/command/server.go
View File

@@ -56,13 +56,8 @@ func Server(cfg *config.Config) *cli.Command {
}
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
metrics = metrics.New()
ctx, cancel = context.WithCancel(c.Context)
metrics = metrics.New()
)
defer cancel()

9
services/invitations/pkg/command/server.go
View File

@@ -37,13 +37,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
metrics = metrics.New(metrics.Logger(logger))
ctx, cancel = context.WithCancel(c.Context)
metrics = metrics.New(metrics.Logger(logger))
)
defer cancel()

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

@@ -33,12 +33,7 @@ func Server(cfg *config.Config) *cli.Command {
logger := logging.Configure(cfg.Service.Name, cfg.Log)
gr := run.Group{}
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()

8
services/notifications/pkg/command/server.go
View File

@@ -53,13 +53,7 @@ func Server(cfg *config.Config) *cli.Command {
gr := run.Group{}
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()
{

9
services/ocs/pkg/command/server.go
View File

@@ -42,13 +42,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
metrics = metrics.New()
ctx, cancel = context.WithCancel(c.Context)
metrics = metrics.New()
)
defer cancel()

9
services/policies/pkg/command/server.go
View File

@@ -35,13 +35,8 @@ func Server(cfg *config.Config) *cli.Command {
Action: func(c *cli.Context) error {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
logger = log.NewLogger(
ctx, cancel = context.WithCancel(c.Context)
logger = log.NewLogger(
log.Name(cfg.Service.Name),
log.Level(cfg.Log.Level),
log.Pretty(cfg.Log.Pretty),

12
services/postprocessing/pkg/command/server.go
View File

@@ -36,15 +36,9 @@ func Server(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
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)
}()
gr = run.Group{}
logger = logging.Configure(cfg.Service.Name, cfg.Log)
ctx, cancel = context.WithCancel(c.Context)
)
defer cancel()

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

@@ -120,12 +120,7 @@ func Server(cfg *config.Config) *cli.Command {
m := metrics.New()
gr := run.Group{}
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()

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

@@ -41,12 +41,7 @@ func Server(cfg *config.Config) *cli.Command {
return err
}
gr := run.Group{}
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()
mtrcs := metrics.New()

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

@@ -44,12 +44,7 @@ func Server(cfg *config.Config) *cli.Command {
}
servers := run.Group{}
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()
mtrcs := metrics.New()

9
services/sse/pkg/command/server.go
View File

@@ -37,13 +37,8 @@ func Server(cfg *config.Config) *cli.Command {
Action: func(c *cli.Context) error {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
logger = log.NewLogger(
ctx, cancel = context.WithCancel(c.Context)
logger = log.NewLogger(
log.Name(cfg.Service.Name),
log.Level(cfg.Log.Level),
log.Pretty(cfg.Log.Pretty),

12
services/store/pkg/command/server.go
View File

@@ -35,9 +35,6 @@ func Server(cfg *config.Config) *cli.Command {
if err != nil {
return err
}
if err != nil {
return err
}
cfg.GrpcClient, err = ogrpc.NewClient(
append(ogrpc.GetClientOptions(cfg.GRPCClientTLS), ogrpc.WithTraceProvider(traceProvider))...,
)
@@ -47,13 +44,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
metrics = metrics.New()
ctx, cancel = context.WithCancel(c.Context)
metrics = metrics.New()
)
defer cancel()

11
services/thumbnails/pkg/command/server.go
View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Before: func(_ *cli.Context) error {
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(_ *cli.Context) error {
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)
traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
@@ -43,13 +43,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
m = metrics.New()
ctx, cancel = context.WithCancel(c.Context)
m = metrics.New()
)
defer cancel()

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

@@ -70,12 +70,7 @@ func Server(cfg *config.Config) *cli.Command {
}
gr := run.Group{}
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)
mtrcs := metrics.New()
mtrcs.BuildInfo.WithLabelValues(version.GetString()).Set(1)

11
services/web/pkg/command/server.go
View File

@@ -27,7 +27,7 @@ func Server(cfg *config.Config) *cli.Command {
Before: func(_ *cli.Context) error {
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(_ *cli.Context) error {
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)
traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
if err != nil {
@@ -49,13 +49,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
m = metrics.New()
ctx, cancel = context.WithCancel(c.Context)
m = metrics.New()
)
defer cancel()

9
services/webdav/pkg/command/server.go
View File

@@ -44,13 +44,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
metrics = metrics.New()
ctx, cancel = context.WithCancel(c.Context)
metrics = metrics.New()
)
defer cancel()

9
services/webfinger/pkg/command/server.go
View File

@@ -38,13 +38,8 @@ func Server(cfg *config.Config) *cli.Command {
var (
gr = run.Group{}
ctx, cancel = func() (context.Context, context.CancelFunc) {
if cfg.Context == nil {
return context.WithCancel(context.Background())
}
return context.WithCancel(cfg.Context)
}()
m = metrics.New(metrics.Logger(logger))
ctx, cancel = context.WithCancel(c.Context)
m = metrics.New(metrics.Logger(logger))
)
defer cancel()