opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

StopContainer: small refactor

Browse Source 
Move the stopSignal decl into the branch where it's actually used.

[NO NEW TESTS NEEDED] as it's just a small refactor.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2023-01-19 10:57:31 +01:00
parent e8b35a8c20
commit ac47d07194
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/oci_conmon_common.go
View File

@ -400,12 +400,11 @@ func (r *ConmonOCIRuntime) StopContainer(ctr *Container, timeout uint, all bool)
return nil return nil
} }
if timeout > 0 {
stopSignal := ctr.config.StopSignal stopSignal := ctr.config.StopSignal
if stopSignal == 0 { if stopSignal == 0 {
stopSignal = uint(syscall.SIGTERM) stopSignal = uint(syscall.SIGTERM)
} }
if timeout > 0 {
if err := r.KillContainer(ctr, stopSignal, all); err != nil { if err := r.KillContainer(ctr, stopSignal, all); err != nil {
// Is the container gone? // Is the container gone?
// If so, it probably died between the first check and // If so, it probably died between the first check and