More graceful exit handling when calling top processes

bakks · Jan 16, 2023 · 9e50f7d · 9e50f7d
1 parent cf17a33
commit 9e50f7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -308,6 +308,7 @@ type PoptopConfig struct {
 	TileWindows bool
 }
 
+// Kong CLI parser option configuration
 var cli struct {
 	Help            bool `short:"h" help:"Show help information"`
 	RedrawInterval  int  `short:"r" help:"Redraw interval in milliseconds (how often to repaint charts)" default:"500"`

diff --git a/top.go b/top.go
@@ -28,7 +28,7 @@ func newTopBoxes(ctx context.Context, config *PoptopConfig) ([]container.Option,
 	interval := config.SampleInterval * 4
 
 	go periodic(ctx, interval, func() error {
-		topCpu, topMem := topProcesses(ctx, config)
+		topCpu, topMem, err := topProcesses(ctx, config)
 		if err != nil {
 			return err
 		}
@@ -133,10 +133,10 @@ func (this *PsProcess) String() string {
 }
 
 // Create CPU and Memory top lists using output from a shared ps command execution.
-func topProcesses(ctx context.Context, config *PoptopConfig) ([]*PsProcess, []*PsProcess) {
+func topProcesses(ctx context.Context, config *PoptopConfig) ([]*PsProcess, []*PsProcess, error) {
 	procs, err := GetPsProcesses(ctx)
 	if err != nil {
-		panic(err)
+		return nil, nil, err
 	}
 
 	sort.Slice(procs, func(i, j int) bool {
@@ -153,5 +153,5 @@ func topProcesses(ctx context.Context, config *PoptopConfig) ([]*PsProcess, []*P
 	procsByMem := make([]*PsProcess, min(config.TopRowsShown, len(procs)))
 	copy(procsByMem, procs)
 
-	return procsByCpu, procsByMem
+	return procsByCpu, procsByMem, nil
 }