containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix comment on container.Stop() 

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #68
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2017-11-28 11:30:15 -05:00 committed by Atomic Bot
parent 4f8fe2b810
commit bbef986214
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container.go
View File

@ -516,9 +516,9 @@ func (c *Container) Start() error {
return nil return nil
} }
// Stop uses the container's requested stop signal (or SIGTERM if no signal was // Stop uses the container's stop signal (or SIGTERM if no signal was specified)
// specified) to stop the container, and if it has not stopped after the given // to stop the container, and if it has not stopped after the given timeout (in
// timeout (in seconds), uses SIGKILL to attempt to forcibly stop the container // seconds), uses SIGKILL to attempt to forcibly stop the container.
// If timeout is 0, SIGKILL will be used immediately // If timeout is 0, SIGKILL will be used immediately
func (c *Container) Stop(timeout int64) error { func (c *Container) Stop(timeout int64) error {
c.lock.Lock() c.lock.Lock()

2
libpod/runtime.go
View File

@ -214,7 +214,7 @@ func (r *Runtime) Shutdown(force bool) error {
// Shutdown all containers if --force is given // Shutdown all containers if --force is given
if force { if force {
ctrs, err := r.state.AllContainers() ctrs, err := r.state.AllContainers()
if err !=nil { if err != nil {
logrus.Errorf("Error retrieving containers from database: %v", err) logrus.Errorf("Error retrieving containers from database: %v", err)
} else { } else {
for _, ctr := range ctrs { for _, ctr := range ctrs {