From 4f6148c975fa5f5f9745e056ead4629bb85e2f49 Mon Sep 17 00:00:00 2001 From: Zack Olson Date: Tue, 9 Jul 2024 11:17:44 -0400 Subject: [PATCH] check for dbus channel open and fix initialActorError logging --- ee/desktop/user/notify/notify_linux.go | 6 +++++- pkg/rungroup/rungroup.go | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ee/desktop/user/notify/notify_linux.go b/ee/desktop/user/notify/notify_linux.go index a33977e39..5f1adc5bb 100644 --- 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 index 0b4d0aaef..16a92d747 100644 --- 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,