From 1824576de82ad170d381a3ff5ba44f2d722c822d Mon Sep 17 00:00:00 2001 From: Rebecca Mahany-Horton Date: Thu, 21 Nov 2024 16:40:02 -0500 Subject: [PATCH] Don't perform remote restart yet (#1966) --- cmd/launcher/launcher.go | 10 ++++++---- cmd/launcher/main.go | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/launcher/launcher.go b/cmd/launcher/launcher.go index 9e67d59c7..1a9bb8a43 100644 --- a/cmd/launcher/launcher.go +++ b/cmd/launcher/launcher.go @@ -37,7 +37,6 @@ import ( "github.com/kolide/launcher/ee/control/consumers/flareconsumer" "github.com/kolide/launcher/ee/control/consumers/keyvalueconsumer" "github.com/kolide/launcher/ee/control/consumers/notificationconsumer" - "github.com/kolide/launcher/ee/control/consumers/remoterestartconsumer" "github.com/kolide/launcher/ee/control/consumers/uninstallconsumer" "github.com/kolide/launcher/ee/debug/checkups" desktopRunner "github.com/kolide/launcher/ee/desktop/runner" @@ -470,9 +469,12 @@ func runLauncher(ctx context.Context, cancel func(), multiSlogger, systemMultiSl // register notifications consumer actionsQueue.RegisterActor(notificationconsumer.NotificationSubsystem, notificationConsumer) - remoteRestartConsumer := remoterestartconsumer.New(k) - runGroup.Add("remoteRestart", remoteRestartConsumer.Execute, remoteRestartConsumer.Interrupt) - actionsQueue.RegisterActor(remoterestartconsumer.RemoteRestartActorType, remoteRestartConsumer) + // For now, commenting out the remote restart consumer until we can fix up the restart behavior + /* + remoteRestartConsumer := remoterestartconsumer.New(k) + runGroup.Add("remoteRestart", remoteRestartConsumer.Execute, remoteRestartConsumer.Interrupt) + actionsQueue.RegisterActor(remoterestartconsumer.RemoteRestartActorType, remoteRestartConsumer) + */ // Set up our tracing instrumentation authTokenConsumer := keyvalueconsumer.New(k.TokenStore()) diff --git a/cmd/launcher/main.go b/cmd/launcher/main.go index 60dff9946..d4fb53c6a 100644 --- a/cmd/launcher/main.go +++ b/cmd/launcher/main.go @@ -15,7 +15,6 @@ import ( "github.com/kolide/kit/env" "github.com/kolide/kit/logutil" "github.com/kolide/kit/version" - "github.com/kolide/launcher/ee/control/consumers/remoterestartconsumer" "github.com/kolide/launcher/ee/tuf" "github.com/kolide/launcher/ee/watchdog" "github.com/kolide/launcher/pkg/contexts/ctxlog" @@ -154,7 +153,7 @@ func runMain() int { ctx = ctxlog.NewContext(ctx, logger) if err := runLauncher(ctx, cancel, slogger, systemSlogger, opts); err != nil { - if !tuf.IsLauncherReloadNeededErr(err) && !errors.Is(err, remoterestartconsumer.ErrRemoteRestartRequested) { + if !tuf.IsLauncherReloadNeededErr(err) { level.Debug(logger).Log("msg", "run launcher", "stack", fmt.Sprintf("%+v", err)) return 1 }