InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: killWithSignal, killPossiblyDeadProcess: accept syscall.Signal

Browse Source 
This helps reducing some type-juggling / conversions further up
the stack.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2022-05-02 00:28:17 +02:00
parent 2ec2b65e45
commit ea1eb449b7
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/stop.go
View File

@@ -2,6 +2,7 @@ package daemon // import "github.com/docker/docker/daemon"
import (
"context"
"syscall"
"time"
containertypes "github.com/docker/docker/api/types/container"
@@ -42,7 +43,7 @@ func (daemon *Daemon) containerStop(ctx context.Context, ctr *container.Containe
}
var (
stopSignal = ctr.StopSignal()
stopSignal = syscall.Signal(ctr.StopSignal())
stopTimeout = ctr.StopTimeout()
)
if options.Signal != "" {
@@ -50,7 +51,7 @@ func (daemon *Daemon) containerStop(ctx context.Context, ctr *container.Containe
if err != nil {
return errdefs.InvalidParameter(err)
}
stopSignal = int(sig)
stopSignal = sig
}
if options.Timeout != nil {
stopTimeout = *options.Timeout