From 990655448dec63ef8add376becb1a20ae184a162 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Wed, 28 Oct 2015 15:15:22 -0700 Subject: [PATCH] Remove unnecessary error returns Signed-off-by: Alexander Morozov --- daemon/daemon.go | 8 +++----- daemon/stats.go | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index efb6bf824a..e9db5eb2f7 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -955,14 +955,12 @@ func (daemon *Daemon) stats(c *Container) (*execdriver.ResourceStats, error) { return daemon.execDriver.Stats(c.ID) } -func (daemon *Daemon) subscribeToContainerStats(c *Container) (chan interface{}, error) { - ch := daemon.statsCollector.collect(c) - return ch, nil +func (daemon *Daemon) subscribeToContainerStats(c *Container) chan interface{} { + return daemon.statsCollector.collect(c) } -func (daemon *Daemon) unsubscribeToContainerStats(c *Container, ch chan interface{}) error { +func (daemon *Daemon) unsubscribeToContainerStats(c *Container, ch chan interface{}) { daemon.statsCollector.unsubscribe(c, ch) - return nil } func (daemon *Daemon) changes(container *Container) ([]archive.Change, error) { diff --git a/daemon/stats.go b/daemon/stats.go index ae3a2d918b..d3837e14c6 100644 --- a/daemon/stats.go +++ b/daemon/stats.go @@ -35,11 +35,6 @@ func (daemon *Daemon) ContainerStats(prefixOrName string, config *ContainerStats return json.NewEncoder(config.OutStream).Encode(&types.Stats{}) } - updates, err := daemon.subscribeToContainerStats(container) - if err != nil { - return err - } - if config.Stream { // Write an empty chunk of data. // This is to ensure that the HTTP status code is sent immediately, @@ -65,6 +60,7 @@ func (daemon *Daemon) ContainerStats(prefixOrName string, config *ContainerStats enc := json.NewEncoder(config.OutStream) + updates := daemon.subscribeToContainerStats(container) defer daemon.unsubscribeToContainerStats(container, updates) noStreamFirstFrame := true