0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #407 from thaJeztah/19.03_backport_better_container_error

Browse source 
[19.03 backport] Propagate GetContainer error from event processor
This commit is contained in:
Andrew Hsu 2019-10-28 10:50:46 -07:00 • committed by GitHub
commit 0e8949a003
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/monitor.go
View file

@ -2,8 +2,6 @@ package daemon // import "github.com/docker/docker/daemon"
import (
"context"
"errors"
"fmt"
"runtime"
"strconv"
"time"
@ -12,6 +10,7 @@ import (
"github.com/docker/docker/container"
libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
"github.com/docker/docker/restartmanager"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@ -29,8 +28,8 @@ func (daemon *Daemon) setStateCounter(c *container.Container) {
// ProcessEvent is called by libcontainerd whenever an event occurs
func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei libcontainerdtypes.EventInfo) error {
c, err := daemon.GetContainer(id)
if c == nil || err != nil {
return fmt.Errorf("no such container: %s", id)
if err != nil {
return errors.Wrapf(err, "could not find container %s", id)
}
switch e {