Add Error function; improve logging

cjbassi · Apr 11, 2018 · 8b7b7bb · 8b7b7bb
1 parent 96596fe
commit 8b7b7bb
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 9 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/utils/utils.go b/utils/utils.go
@@ -1,7 +1,10 @@
 package utils
 
 import (
+	"fmt"
 	"math"
+
+	ui "github.com/cjbassi/termui"
 )
 
 func BytesToKB(b uint64) float64 {
@@ -15,3 +18,14 @@ func BytesToMB(b uint64) float64 {
 func BytesToGB(b uint64) float64 {
 	return float64(b) / math.Pow10(9)
 }
+
+func Error(issue, diagnostics string) {
+	ui.Close()
+	fmt.Println("Error caught. Exiting program.")
+	fmt.Println()
+	fmt.Println("Issue with " + issue + ".")
+	fmt.Println()
+	fmt.Println("Diagnostics:\n" + diagnostics)
+	fmt.Println()
+	panic(1)
+}
diff --git a/vendor/github.com/cjbassi/termui/Gopkg.lock b/vendor/github.com/cjbassi/termui/Gopkg.lock
diff --git a/vendor/github.com/cjbassi/termui/README.md b/vendor/github.com/cjbassi/termui/README.md
diff --git a/vendor/github.com/cjbassi/termui/sparkline.go b/vendor/github.com/cjbassi/termui/sparkline.go
diff --git a/vendor/github.com/cjbassi/termui/table.go b/vendor/github.com/cjbassi/termui/table.go
diff --git a/vendor/github.com/cjbassi/termui/utils.go b/vendor/github.com/cjbassi/termui/utils.go
diff --git a/widgets/cpu.go b/widgets/cpu.go
@@ -1,10 +1,11 @@
 package widgets
 
 import (
-	"log"
+	"fmt"
 	"strconv"
 	"time"
 
+	"github.com/cjbassi/gotop/utils"
 	ui "github.com/cjbassi/termui"
 	psCPU "github.com/shirou/gopsutil/cpu"
 )
@@ -50,7 +51,14 @@ func (self *CPU) update() {
 		percents, _ := psCPU.Percent(self.interval, true)
 		if len(percents) != self.Count {
 			count, _ := psCPU.Counts(false)
-			log.Fatalf("\nself.Count: %d\ngopsutil.Counts(): %d\nlen(percents): %d\npercents: %v\nself.interval: %v", self.Count, count, len(percents), percents, self.interval)
+			utils.Error("CPU percentages",
+				fmt.Sprint(
+					"self.Count: ", self.Count, "\n",
+					"gopsutil.Counts(): ", count, "\n",
+					"len(percents): ", len(percents), "\n",
+					"percents: ", percents, "\n",
+					"self.interval: ", self.interval,
+				))
 		}
 		for i := 0; i < self.Count; i++ {
 			key := "CPU" + strconv.Itoa(i)