diff options
author | Caleb Bassi <calebjbassi@gmail.com> | 2018-12-13 21:32:22 -0800 |
---|---|---|
committer | Caleb Bassi <calebjbassi@gmail.com> | 2018-12-13 21:32:22 -0800 |
commit | 23b961bcfaa02a76d8f81ddbb3bae7d5ed3bf883 (patch) | |
tree | ec3ee8bb519b03d1a6ee0d41a85d0e9cbd34165e | |
parent | f608f636cefbc864a6dcc69ec1663f4d42d7865c (diff) |
Fix panics on error for Mem widget
-rw-r--r-- | src/widgets/mem.go | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/widgets/mem.go b/src/widgets/mem.go index fa3b824..86f3a45 100644 --- a/src/widgets/mem.go +++ b/src/widgets/mem.go @@ -41,18 +41,20 @@ func (self *Mem) update() { main, err := psMem.VirtualMemory() if err != nil { log.Printf("failed to get main memory info from gopsutil: %v", err) + } else { + self.Data["Main"] = append(self.Data["Main"], main.UsedPercent) + mainTotalBytes, mainTotalMagnitude := utils.ConvertBytes(main.Total) + mainUsedBytes, mainUsedMagnitude := utils.ConvertBytes(main.Used) + self.Labels["Main"] = fmt.Sprintf("%3.0f%% %5.1f%s/%.0f%s", main.UsedPercent, mainUsedBytes, mainUsedMagnitude, mainTotalBytes, mainTotalMagnitude) } + swap, err := psMem.SwapMemory() if err != nil { log.Printf("failed to get swap memory info from gopsutil: %v", err) + } else { + self.Data["Swap"] = append(self.Data["Swap"], swap.UsedPercent) + swapTotalBytes, swapTotalMagnitude := utils.ConvertBytes(swap.Total) + swapUsedBytes, swapUsedMagnitude := utils.ConvertBytes(swap.Used) + self.Labels["Swap"] = fmt.Sprintf("%3.0f%% %5.1f%s/%.0f%s", swap.UsedPercent, swapUsedBytes, swapUsedMagnitude, swapTotalBytes, swapTotalMagnitude) } - self.Data["Main"] = append(self.Data["Main"], main.UsedPercent) - self.Data["Swap"] = append(self.Data["Swap"], swap.UsedPercent) - - mainTotalBytes, mainTotalMagnitude := utils.ConvertBytes(main.Total) - swapTotalBytes, swapTotalMagnitude := utils.ConvertBytes(swap.Total) - mainUsedBytes, mainUsedMagnitude := utils.ConvertBytes(main.Used) - swapUsedBytes, swapUsedMagnitude := utils.ConvertBytes(swap.Used) - self.Labels["Main"] = fmt.Sprintf("%3.0f%% %5.1f%s/%.0f%s", main.UsedPercent, mainUsedBytes, mainUsedMagnitude, mainTotalBytes, mainTotalMagnitude) - self.Labels["Swap"] = fmt.Sprintf("%3.0f%% %5.1f%s/%.0f%s", swap.UsedPercent, swapUsedBytes, swapUsedMagnitude, swapTotalBytes, swapTotalMagnitude) } |