kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #39497 from cpuguy83/better_container_error

Browse source 
Propagate GetContainer error from event processor
This commit is contained in:
Michael Crosby 2019-07-15 13:53:58 -04:00 • committed by GitHub
commit 78deb9863f
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 ( import (
"context" "context"
"errors"
"fmt"
"runtime" "runtime"
"strconv" "strconv"
"time" "time"
@ -12,6 +10,7 @@ import (
"github.com/docker/docker/container" "github.com/docker/docker/container"
libcontainerdtypes "github.com/docker/docker/libcontainerd/types" libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
"github.com/docker/docker/restartmanager" "github.com/docker/docker/restartmanager"
"github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -29,8 +28,8 @@ func (daemon *Daemon) setStateCounter(c *container.Container) {
// ProcessEvent is called by libcontainerd whenever an event occurs // ProcessEvent is called by libcontainerd whenever an event occurs
func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei libcontainerdtypes.EventInfo) error { func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei libcontainerdtypes.EventInfo) error {
c, err := daemon.GetContainer(id) c, err := daemon.GetContainer(id)
if c == nil || err != nil { if err != nil {
return fmt.Errorf("no such container: %s", id) return errors.Wrapf(err, "could not find container %s", id)
} }
switch e { switch e {