Making it not crash on Windows

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2016-02-28 18:28:09 -08:00
parent b413f33b99
commit 3d8e37cf9d
8 changed files with 146 additions and 101 deletions

View file

@ -1,23 +1,6 @@
package supervisor
import "github.com/cloudfoundry/gosigar"
type Machine struct {
Cpus int
Memory int64
}
func CollectMachineInformation() (Machine, error) {
m := Machine{}
cpu := sigar.CpuList{}
if err := cpu.Get(); err != nil {
return m, err
}
m.Cpus = len(cpu.List)
mem := sigar.Mem{}
if err := mem.Get(); err != nil {
return m, err
}
m.Memory = int64(mem.Total / 1024 / 1024)
return m, nil
}

View file

@ -0,0 +1,18 @@
package supervisor
import "github.com/cloudfoundry/gosigar"
func CollectMachineInformation() (Machine, error) {
m := Machine{}
cpu := sigar.CpuList{}
if err := cpu.Get(); err != nil {
return m, err
}
m.Cpus = len(cpu.List)
mem := sigar.Mem{}
if err := mem.Get(); err != nil {
return m, err
}
m.Memory = int64(mem.Total / 1024 / 1024)
return m, nil
}

View file

@ -0,0 +1,5 @@
package supervisor
func CollectMachineInformation() (Machine, error) {
return Machine{}, nil
}

View file

@ -11,7 +11,8 @@ import (
// Linux implementation. @crosbymichael - Help needed.
func NewMonitor() (*Monitor, error) {
return nil, errors.New("NewMonitor not implemented on Windows")
// During Windows bring-up, don't error out other binary bombs immediately.
return &Monitor{}, nil
}
type Monitor struct {