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 /cmd/podman/create.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 'cmd/podman/create.go')
| -rw-r--r-- | cmd/podman/create.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index d3e14742b..8b64a1cb0 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -110,7 +110,7 @@ type createConfig struct { ShmDir string SigProxy bool //sig-proxy StopSignal syscall.Signal // stop-signal - StopTimeout int64 // stop-timeout + StopTimeout uint // stop-timeout StorageOpts []string //storage-opt Sysctl map[string]string //sysctl Tmpfs []string // tmpfs @@ -494,7 +494,7 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime) (*createConfig, er ShmDir: shmDir, SigProxy: c.Bool("sig-proxy"), StopSignal: stopSignal, - StopTimeout: c.Int64("stop-timeout"), + StopTimeout: c.Uint("stop-timeout"), StorageOpts: c.StringSlice("storage-opt"), Sysctl: sysctl, Tmpfs: c.StringSlice("tmpfs"), |