docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor code 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2014-12-30 20:03:55 +00:00
parent aefe450036
commit 4350b44b56
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cluster/node.go
View File

@ -178,6 +178,11 @@ func (n *Node) refreshContainer(ID string) error {
}
func (n *Node) ForceRefreshContainer(c dockerclient.Container) error {
return n.inspectContainer(c, n.containers, true)
}
func (n *Node) inspectContainer(c dockerclient.Container, containers map[string]*Container, lock bool) error {
container := &Container{}
container.Container = c
container.node = n
@ -191,9 +196,11 @@ func (n *Node) ForceRefreshContainer(c dockerclient.Container) error {
// real CpuShares -> nb of CPUs
container.Info.Config.CpuShares = container.Info.Config.CpuShares / 100.0 * n.Cpus
if lock {
n.Lock()
n.containers[container.Id] = container
n.Unlock()
defer n.Unlock()
}
containers[container.Id] = container
return nil
}
@ -205,20 +212,9 @@ func (n *Node) updateContainer(c dockerclient.Container, containers map[string]*
containers[current.Id] = current
} else {
// This is a brand new container.
container := &Container{}
container.Container = c
container.node = n
info, err := n.client.InspectContainer(c.Id)
if err != nil {
return containers, err
if err := n.inspectContainer(c, containers, false); err != nil {
return nil, err
}
container.Info = *info
// real CpuShares -> nb of CPUs
container.Info.Config.CpuShares = container.Info.Config.CpuShares / 100.0 * n.Cpus
containers[container.Id] = container
}
return containers, nil
}