From a3c4801c9291c0db78c5cc0748d5d2dd5e44a98f Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 21 Apr 2015 21:59:59 +0200 Subject: [PATCH] Remove not needed call to container.readHostConfig() Signed-off-by: Antonio Murdaca --- daemon/container.go | 6 ++++-- daemon/daemon.go | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/container.go b/daemon/container.go index 9dc0696ea7..a611f0da8d 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -178,11 +178,13 @@ func (container *Container) readHostConfig() error { return nil } - data, err := ioutil.ReadFile(pth) + f, err := os.Open(pth) if err != nil { return err } - return json.Unmarshal(data, container.hostConfig) + defer f.Close() + + return json.NewDecoder(f).Decode(&container.hostConfig) } func (container *Container) WriteHostConfig() error { diff --git a/daemon/daemon.go b/daemon/daemon.go index d08d22cfdf..3a9e7c8c81 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -194,8 +194,6 @@ func (daemon *Daemon) load(id string) (*Container, error) { return container, fmt.Errorf("Container %s is stored at %s", container.ID, id) } - container.readHostConfig() - return container, nil }