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/runtime.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/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 91c6c7683..59d7f7e3c 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -277,7 +277,7 @@ func (r *Runtime) Shutdown(force bool) error { logrus.Errorf("Error retrieving containers from database: %v", err) } else { for _, ctr := range ctrs { - if err := ctr.Stop(ctrRemoveTimeout); err != nil { + if err := ctr.Stop(CtrRemoveTimeout); err != nil { logrus.Errorf("Error stopping container %s: %v", ctr.ID(), err) } } |