prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #67 from vmarmol/fix-dep

Browse Source 
Rename libcontainer.Container -> libcontainer.Config
This commit is contained in:
monnand 2014-06-24 17:58:11 -04:00
commit ae7da7f4b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cadvisor Executable file
View File

Binary file not shown.

6
container/docker/handler.go
View File

@ -118,7 +118,7 @@ func (self *dockerContainerHandler) isDockerContainer() bool {
} }
// TODO(vmarmol): Switch to getting this from libcontainer once we have a solid API. // TODO(vmarmol): Switch to getting this from libcontainer once we have a solid API.
func readLibcontainerSpec(id string) (spec *libcontainer.Container, err error) { func readLibcontainerSpec(id string) (spec *libcontainer.Config, err error) {
dir := "/var/lib/docker/execdriver/native" dir := "/var/lib/docker/execdriver/native"
configPath := path.Join(dir, id, "container.json") configPath := path.Join(dir, id, "container.json")
f, err := os.Open(configPath) f, err := os.Open(configPath)
@ -127,7 +127,7 @@ func readLibcontainerSpec(id string) (spec *libcontainer.Container, err error) {
} }
defer f.Close() defer f.Close()
d := json.NewDecoder(f) d := json.NewDecoder(f)
ret := new(libcontainer.Container) ret := new(libcontainer.Config)
err = d.Decode(ret) err = d.Decode(ret)
if err != nil { if err != nil {
return return
@ -136,7 +136,7 @@ func readLibcontainerSpec(id string) (spec *libcontainer.Container, err error) {
return return
} }
func libcontainerConfigToContainerSpec(config *libcontainer.Container, mi *info.MachineInfo) *info.ContainerSpec { func libcontainerConfigToContainerSpec(config *libcontainer.Config, mi *info.MachineInfo) *info.ContainerSpec {
spec := new(info.ContainerSpec) spec := new(info.ContainerSpec)
spec.Memory = new(info.MemorySpec) spec.Memory = new(info.MemorySpec)
spec.Memory.Limit = math.MaxUint64 spec.Memory.Limit = math.MaxUint64