diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-12-19 15:42:30 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-20 18:10:43 +0000 |
| commit | 1f49f555af0709ea7c12becdb750ba60a00eaf1d (patch) | |
| tree | 9a39b8d0b61ff8d4cb88619ad49bd229320e952c /libpod/oci.go | |
| parent | 3607fcb553046b9a51c4b591ddf20236c628dc57 (diff) | |
| download | podman-1f49f555af0709ea7c12becdb750ba60a00eaf1d.tar.gz podman-1f49f555af0709ea7c12becdb750ba60a00eaf1d.tar.bz2 podman-1f49f555af0709ea7c12becdb750ba60a00eaf1d.zip | |
Plumb through the --stop-timeout signal handling
podman run/create have the ability to set the stop timeout flag.
We need to stop it in the database.
Also Allowing negative time for stop timeout makes no sense, so switching
to timeout of uint, allows user to specify huge timeout values.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #158
Approved by: TomSweeneyRedHat
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 49bf95bc5..c122071e3 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -401,7 +401,7 @@ func (r *OCIRuntime) killContainer(ctr *Container, signal uint) error { // immediately kill with SIGKILL // Does not set finished time for container, assumes you will run updateStatus // after to pull the exit code -func (r *OCIRuntime) stopContainer(ctr *Container, timeout int64) error { +func (r *OCIRuntime) stopContainer(ctr *Container, timeout uint) error { // Ping the container to see if it's alive // If it's not, it's already stopped, return err := unix.Kill(ctr.state.PID, 0) |