github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

virtcontainers: Remove useless startSandbox wrapper

Browse Source 
startSandbox() wraps a single operation (sandbox.Start()), so we can
remove it and make the code easier to read/follow.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2018-12-09 12:35:07 +01:00 committed by Eric Ernst
parent a8e158c9e3
commit ebf8547c38
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
virtcontainers/api.go
View File

@ -234,12 +234,8 @@ func StartSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
} }
defer s.releaseStatelessSandbox() defer s.releaseStatelessSandbox()
return startSandbox(s)
}
func startSandbox(s *Sandbox) (*Sandbox, error) {
// Start it // Start it
err := s.Start() err = s.Start()
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -285,6 +281,7 @@ func RunSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
span, ctx := trace(ctx, "RunSandbox") span, ctx := trace(ctx, "RunSandbox")
defer span.Finish() defer span.Finish()
// Create the sandbox
s, err := createSandboxFromConfig(ctx, sandboxConfig, factory) s, err := createSandboxFromConfig(ctx, sandboxConfig, factory)
if err != nil { if err != nil {
return nil, err return nil, err
@ -297,7 +294,13 @@ func RunSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
} }
defer unlockSandbox(lockFile) defer unlockSandbox(lockFile)
return startSandbox(s) // Start the sandbox
err = s.Start()
if err != nil {
return nil, err
}
return s, nil
} }
// ListSandbox is the virtcontainers sandbox listing entry point. // ListSandbox is the virtcontainers sandbox listing entry point.