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/sql_state_internal.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/sql_state_internal.go')
| -rw-r--r-- | libpod/sql_state_internal.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go index e1ecc8ea6..8513216fa 100644 --- a/libpod/sql_state_internal.go +++ b/libpod/sql_state_internal.go @@ -176,6 +176,7 @@ func prepareDB(db *sql.DB) (err error) { Stdin INTEGER NOT NULL, LabelsJSON TEXT NOT NULL, StopSignal INTEGER NOT NULL, + StopTimeout INTEGER NOT NULL, CreatedTime TEXT NOT NULL, RootfsImageID TEXT NOT NULL, RootfsImageName TEXT NOT NULL, @@ -284,6 +285,7 @@ func ctrFromScannable(row scannable, runtime *Runtime, specsDir string, lockDir stdin int labelsJSON string stopSignal uint + stopTimeout uint createdTimeString string rootfsImageID string rootfsImageName string @@ -313,6 +315,7 @@ func ctrFromScannable(row scannable, runtime *Runtime, specsDir string, lockDir &stdin, &labelsJSON, &stopSignal, + &stopTimeout, &createdTimeString, &rootfsImageID, &rootfsImageName, @@ -351,6 +354,7 @@ func ctrFromScannable(row scannable, runtime *Runtime, specsDir string, lockDir ctr.config.StaticDir = staticDir ctr.config.Stdin = boolFromSQL(stdin) ctr.config.StopSignal = stopSignal + ctr.config.StopTimeout = stopTimeout ctr.state.State = ContainerState(state) ctr.state.ConfigPath = configPath |