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

Merge pull request #979 from jimmidyson/readint64

Browse Source 
Rename readInt64 -> readUInt64 for clarity
This commit is contained in:
Jimmi Dyson 2015-11-25 19:50:20 +00:00
commit 34036be6e0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container/raw/handler.go
View File

@ -138,7 +138,7 @@ func readString(dirpath string, file string) string {
return strings.TrimSpace(string(out)) return strings.TrimSpace(string(out))
} }
func readInt64(dirpath string, file string) uint64 { func readUInt64(dirpath string, file string) uint64 {
out := readString(dirpath, file) out := readString(dirpath, file)
if out == "" { if out == "" {
return 0 return 0
@ -199,7 +199,7 @@ func (self *rawContainerHandler) GetSpec() (info.ContainerSpec, error) {
if ok { if ok {
if utils.FileExists(cpuRoot) { if utils.FileExists(cpuRoot) {
spec.HasCpu = true spec.HasCpu = true
spec.Cpu.Limit = readInt64(cpuRoot, "cpu.shares") spec.Cpu.Limit = readUInt64(cpuRoot, "cpu.shares")
} }
} }
@ -238,8 +238,8 @@ func (self *rawContainerHandler) GetSpec() (info.ContainerSpec, error) {
if ok { if ok {
if utils.FileExists(memoryRoot) { if utils.FileExists(memoryRoot) {
spec.HasMemory = true spec.HasMemory = true
spec.Memory.Limit = readInt64(memoryRoot, "memory.limit_in_bytes") spec.Memory.Limit = readUInt64(memoryRoot, "memory.limit_in_bytes")
spec.Memory.SwapLimit = readInt64(memoryRoot, "memory.memsw.limit_in_bytes") spec.Memory.SwapLimit = readUInt64(memoryRoot, "memory.memsw.limit_in_bytes")
} }
} }
} }