check for dbus channel open and fix initialActorError logging

kolide · Jul 9, 2024 · 4f6148c · 4f6148c
1 parent 07a5339
commit 4f6148c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ee/desktop/user/notify/notify_linux.go b/ee/desktop/user/notify/notify_linux.go
@@ -75,7 +75,11 @@ func (d *dbusNotifier) Listen() error {
 
 	for {
 		select {
-		case signal := <-d.signal:
+		case signal, open := <-d.signal:
+			if !open {
+				return fmt.Errorf("dbus signal channel closed, cannot proceed")
+			}
+
 			if signal == nil || signal.Name != signalActionInvoked {
 				continue
 			}

diff --git a/pkg/rungroup/rungroup.go b/pkg/rungroup/rungroup.go
@@ -93,7 +93,8 @@ func (g *Group) Run() error {
 
 	g.slogger.Log(context.TODO(), slog.LevelInfo,
 		"received interrupt error from first actor -- shutting down other actors",
-		"err", initialActorErr,
+		"err", initialActorErr.err,
+		"error_source", initialActorErr.errorSourceName,
 	)
 
 	defer g.slogger.Log(context.TODO(), slog.LevelDebug,