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

Merge pull request #17458 from LK4D4/unnec_err

Browse source 
Remove unnecessary error returns
This commit is contained in:
David Calavera 2015-10-28 16:25:40 -07:00
commit 7de2b49ac8
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/daemon.go
View file

@ -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) {

6
daemon/stats.go
View file

@ -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