InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

use router.Cancellable instead of direct CloseNotify

Browse Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov
2016-03-25 11:33:54 -07:00
parent bdd9388c42
commit 62c9e62edc
10 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/stats.go
View File

@@ -5,6 +5,8 @@ import (
"errors"
"runtime"
"golang.org/x/net/context"
"github.com/docker/docker/api/types/backend"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/version"
@@ -14,7 +16,7 @@ import (
// ContainerStats writes information about the container to the stream
// given in the config object.
func (daemon *Daemon) ContainerStats(prefixOrName string, config *backend.ContainerStatsConfig) error {
func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, config *backend.ContainerStatsConfig) error {
if runtime.GOOS == "windows" {
return errors.New("Windows does not support stats")
}
@@ -114,7 +116,7 @@ func (daemon *Daemon) ContainerStats(prefixOrName string, config *backend.Contai
if !config.Stream {
return nil
}
case <-config.Stop:
case <-ctx.Done():
return nil
}
}