globalcancel

cmd/viam-agent/main.go

@@ -46,6 +46,7 @@ type agentOpts struct {
 //nolint:gocognit
 func commonMain() {
 	ctx, cancel := setupExitSignalHandling()
+	agent.GlobalCancel = cancel
 
 	defer func() {
 		cancel()

subsystem.go

@@ -375,6 +375,7 @@ func (s *AgentSubsystem) Update(ctx context.Context, cfg *pb.DeviceSubsystemConf
 
 func (s *AgentSubsystem) tryInner(ctx context.Context, cfg *pb.DeviceSubsystemConfig, newVersion bool) (bool, error) {
 	inner, ok := s.inner.(updatable)
+	s.logger.Infof("in %s tryInner, updatable is %t", s.name, ok)
 	if ok {
 		return inner.Update(ctx, cfg, newVersion)
 	}

subsystems/viamagent/viamagent.go

@@ -81,7 +81,10 @@ func (a *agentSubsystem) Update(ctx context.Context, cfg *pb.DeviceSubsystemConf
 		// if _, err := exec.Command("powershell", "-command", "Restart-Service viam-agent").Output(); err != nil {
 		// 	return false, errw.Wrap(err, "restarting windows service")
 		// }
-		agent.GlobalManager.CloseAll()
+		if agent.GlobalCancel == nil {
+			return false, errors.New("can't call globalCancel because it's nil")
+		}
+		agent.GlobalCancel()
 		return true, nil
 	}
 

utils.go

@@ -35,6 +35,8 @@ var (
 
 	// GlobalManager allows subsystems and other contexts to trigger CloseAll.
 	GlobalManager *Manager
+	// This lets other things stop the main thread.
+	GlobalCancel func()
 )
 
 // GetVersion returns the version embedded at build time.