summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-11-28 11:30:15 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-29 12:15:15 +0000
commitbbef98621491b79d5b2a397bc17ed4d7967a7aff (patch)
treefd947fb11fc5c1bae4669e70f959235cd4fe525d
parent4f8fe2b810f5ed25308bc9be0edc6ace3fac0f64 (diff)
downloadpodman-bbef98621491b79d5b2a397bc17ed4d7967a7aff.tar.gz
podman-bbef98621491b79d5b2a397bc17ed4d7967a7aff.tar.bz2
podman-bbef98621491b79d5b2a397bc17ed4d7967a7aff.zip
Fix comment on container.Stop()
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #68 Approved by: rhatdan
-rw-r--r--libpod/container.go6
-rw-r--r--libpod/runtime.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/libpod/container.go b/libpod/container.go
index 3de0ed02e..8a2ff1fad 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -516,9 +516,9 @@ func (c *Container) Start() error {
return nil
}
-// Stop uses the container's requested stop signal (or SIGTERM if no signal was
-// specified) to stop the container, and if it has not stopped after the given
-// timeout (in seconds), uses SIGKILL to attempt to forcibly stop the container
+// Stop uses the container's stop signal (or SIGTERM if no signal was specified)
+// to stop the container, and if it has not stopped after the given timeout (in
+// seconds), uses SIGKILL to attempt to forcibly stop the container.
// If timeout is 0, SIGKILL will be used immediately
func (c *Container) Stop(timeout int64) error {
c.lock.Lock()
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 74328bed7..1a18b7e8e 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -214,7 +214,7 @@ func (r *Runtime) Shutdown(force bool) error {
// Shutdown all containers if --force is given
if force {
ctrs, err := r.state.AllContainers()
- if err !=nil {
+ if err != nil {
logrus.Errorf("Error retrieving containers from database: %v", err)
} else {
for _, ctr := range ctrs {