github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

use ctx object from cliContext instead of a creating a new one

Browse Source 
Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
This commit is contained in:
Tariq Ibrahim 2024-08-06 13:42:22 -07:00
parent 7f707b5e79
commit 32c2d14932
No known key found for this signature in database
GPG Key ID: 8367AA3C6B8DF06D
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/containerd/command/config.go
View File

@ -87,7 +87,8 @@ var configCommand = &cli.Command{
Name: "default",
Usage: "See the output of the default config",
Action: func(cliContext *cli.Context) error {
return outputConfig(context.Background(), defaultConfig())
ctx := cliContext.Context
return outputConfig(ctx, defaultConfig())
},
},
{
@ -95,7 +96,7 @@ var configCommand = &cli.Command{
Usage: "See the output of the final main config with imported in subconfig files",
Action: func(cliContext *cli.Context) error {
config := defaultConfig()
ctx := context.Background()
ctx := cliContext.Context
if err := srvconfig.LoadConfig(ctx, cliContext.String("config"), config); err != nil && !os.IsNotExist(err) {
return err
}
@ -108,7 +109,7 @@ var configCommand = &cli.Command{
Usage: "Migrate the current configuration file to the latest version (does not migrate subconfig files)",
Action: func(cliContext *cli.Context) error {
config := defaultConfig()
ctx := context.Background()
ctx := cliContext.Context
if err := srvconfig.LoadConfig(ctx, cliContext.String("config"), config); err != nil && !os.IsNotExist(err) {
return err
}

2
cmd/containerd/command/main.go
View File

@ -123,7 +123,7 @@ can be used and modified as necessary as a custom configuration.`
start = time.Now()
signals = make(chan os.Signal, 2048)
serverC = make(chan *server.Server, 1)
ctx, cancel = context.WithCancel(context.Background())
ctx, cancel = context.WithCancel(cliContext.Context)
config = defaultConfig()
)

2
cmd/containerd/command/publish.go
View File

@ -50,7 +50,7 @@ var publishCommand = &cli.Command{
},
},
Action: func(cliContext *cli.Context) error {
ctx := namespaces.WithNamespace(context.Background(), cliContext.String("namespace"))
ctx := namespaces.WithNamespace(cliContext.Context, cliContext.String("namespace"))
topic := cliContext.String("topic")
if topic == "" {
return fmt.Errorf("topic required to publish event: %w", errdefs.ErrInvalidArgument)

2
cmd/ctr/commands/client.go
View File

@ -35,7 +35,7 @@ import (
// defined.
func AppContext(cliContext *cli.Context) (context.Context, context.CancelFunc) {
var (
ctx = context.Background()
ctx = cliContext.Context
timeout = cliContext.Duration("timeout")
namespace = cliContext.String("namespace")
cancel context.CancelFunc