aboutsummaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-01-29 11:59:33 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-01-30 05:02:12 +0000
commitc60d8a0671b48ffdeda68895e0b7d97b252d66d9 (patch)
tree6be6b971913ae7763b79d7eef68dc71284a841c5 /libpod/runtime.go
parentdd133a1ad25f75e5ddd53ed6cf59eedfb6838f54 (diff)
downloadpodman-c60d8a0671b48ffdeda68895e0b7d97b252d66d9.tar.gz
podman-c60d8a0671b48ffdeda68895e0b7d97b252d66d9.tar.bz2
podman-c60d8a0671b48ffdeda68895e0b7d97b252d66d9.zip
Add StopWithTimeout API function for containers
Normal Stop should not need a timeout, and should use the default Add a function that does accept a timeout aside it Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #272 Approved by: rhatdan
Diffstat (limited to 'libpod/runtime.go')
-rw-r--r--libpod/runtime.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 804f69c9e..20ae2c6fe 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -299,7 +299,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.StopWithTimeout(CtrRemoveTimeout); err != nil {
logrus.Errorf("Error stopping container %s: %v", ctr.ID(), err)
}
}