Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions internal/update/apt/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ func (s *Service) UpgradePackages(ctx context.Context, names []string) (<-chan u
defer s.lock.Unlock()
defer close(eventsCh)

// We try anyway to restart the service.
defer func() {
eventsCh <- update.NewDataEvent(update.RestartEvent, "Upgrade completed. Restarting ...")

err := restartServices(ctx)
if err != nil {
eventsCh <- update.NewErrorEvent(fmt.Errorf("error restarting services after upgrade: %w", err))
return
}
}()

eventsCh <- update.NewDataEvent(update.StartEvent, "Upgrade is starting")
stream := runUpgradeCommand(ctx, names)
for line, err := range stream {
Expand Down Expand Up @@ -127,13 +138,6 @@ func (s *Service) UpgradePackages(ctx context.Context, names []string) (<-chan u
}
eventsCh <- update.NewDataEvent(update.UpgradeLineEvent, line)
}
eventsCh <- update.NewDataEvent(update.RestartEvent, "Upgrade completed. Restarting ...")

err := restartServices(ctx)
if err != nil {
eventsCh <- update.NewErrorEvent(fmt.Errorf("error restarting services after upgrade: %w", err))
return
}
}()

return eventsCh, nil
Expand Down