diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-09-21 09:40:30 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-21 20:07:51 +0000 |
| commit | 9e81f9daa4af9802088530a35a72814172430a36 (patch) | |
| tree | e8ae1239d00c83f22a741662852e4dcad34fb2c4 /libpod/container.go | |
| parent | 785e9ea1fd985713db1aa8cc6bec07805faef7a2 (diff) | |
| download | podman-9e81f9daa4af9802088530a35a72814172430a36.tar.gz podman-9e81f9daa4af9802088530a35a72814172430a36.tar.bz2 podman-9e81f9daa4af9802088530a35a72814172430a36.zip | |
Refactor Wait() to not require a timeout
We added a timeout for convenience, but most invocations don't
care about it. Refactor it into WaitWithTimeout() and add a
Wait() that doesn't require a timeout and uses the default.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #1527
Approved by: mheon
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpod/container.go b/libpod/container.go index fc613f406..0b1879208 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -36,8 +36,6 @@ const ( ContainerStateStopped ContainerStatus = iota // ContainerStatePaused indicates that the container has been paused ContainerStatePaused ContainerStatus = iota - // WaitTimeout is the wait timeout before checking for container exit - WaitTimeout = time.Second / time.Millisecond ) // CgroupfsDefaultCgroupParent is the cgroup parent for CGroupFS in libpod @@ -47,6 +45,10 @@ const CgroupfsDefaultCgroupParent = "/libpod_parent" // manager in libpod const SystemdDefaultCgroupParent = "machine.slice" +// DefaultWaitInterval is the default interval between container status checks +// while waiting. +const DefaultWaitInterval = 250 * time.Millisecond + // LinuxNS represents a Linux namespace type LinuxNS int |