From 7d9126e149cabae06ea11728005b0596028db144 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 10 Jul 2019 21:47:50 +0200 Subject: [PATCH] ContainerStats: return early on unsupported API versions Signed-off-by: Sebastiaan van Stijn --- daemon/stats.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/daemon/stats.go b/daemon/stats.go index eb23e272ae..2e770a5b19 100644 --- a/daemon/stats.go +++ b/daemon/stats.go @@ -21,6 +21,10 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c // Engine API version (used for backwards compatibility) apiVersion := config.Version + if runtime.GOOS == "windows" && versions.LessThan(apiVersion, "1.21") { + return errors.New("API versions pre v1.21 do not support stats on Windows") + } + container, err := daemon.GetContainer(prefixOrName) if err != nil { return err @@ -70,9 +74,6 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c var statsJSON interface{} statsJSONPost120 := getStatJSON(v) if versions.LessThan(apiVersion, "1.21") { - if runtime.GOOS == "windows" { - return errors.New("API versions pre v1.21 do not support stats on Windows") - } var ( rxBytes uint64 rxPackets uint64