diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-28 21:51:39 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-28 21:51:39 +0000 |
| commit | 78d4cf6d3a7ce48cd011909c4a5bc2b7cd44e139 (patch) | |
| tree | 79d8f9ddd1fad7979765bf38fa8a9c8857b7ad52 /runsc/sandbox | |
| parent | 8863131d5411013637268f05bd944128898e42af (diff) | |
| parent | f7418e21590e271302a3c375323950c209ce5ced (diff) | |
Merge release-20200522.0-25-gf7418e21 (automated)
Diffstat (limited to 'runsc/sandbox')
| -rw-r--r-- | runsc/sandbox/sandbox.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index e4ec16e2f..6e1a2af25 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -30,6 +30,7 @@ import ( "github.com/cenkalti/backoff" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/syndtr/gocapability/capability" + "gvisor.dev/gvisor/pkg/cleanup" "gvisor.dev/gvisor/pkg/control/client" "gvisor.dev/gvisor/pkg/control/server" "gvisor.dev/gvisor/pkg/log" @@ -119,7 +120,7 @@ func New(conf *boot.Config, args *Args) (*Sandbox, error) { s := &Sandbox{ID: args.ID, Cgroup: args.Cgroup} // The Cleanup object cleans up partially created sandboxes when an error // occurs. Any errors occurring during cleanup itself are ignored. - c := specutils.MakeCleanup(func() { + c := cleanup.Make(func() { err := s.destroy() log.Warningf("error destroying sandbox: %v", err) }) |