PMM-14442 Use modern syntax

Author: ademidoff

managed/services/ha/highavailability.go

@@ -93,9 +93,7 @@ func New(params *models.HAParams) *Service {
 
 // Run runs the high availability service.
 func (s *Service) Run(ctx context.Context) error {
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
+	s.wg.Go(func() {
 		for {
 			select {
 			case <-s.services.Refresh():
@@ -107,7 +105,7 @@ func (s *Service) Run(ctx context.Context) error {
 				return
 			}
 		}
-	}()
+	})
 
 	if !s.params.Enabled {
 		s.l.Infoln("High availability is disabled")

managed/services/ha/services.go

@@ -50,7 +50,7 @@ func (s *services) Add(service LeaderService) error {
 
 	id := service.ID()
 	if _, ok := s.all[id]; ok {
-		return fmt.Errorf("service with id %s is already exist", id)
+		return fmt.Errorf("service with id %s already exists", id)
 	}
 	s.all[id] = service
 	select {
@@ -66,16 +66,17 @@ func (s *services) StartAllServices(ctx context.Context) {
 
 	for id, service := range s.all {
 		if _, ok := s.running[id]; !ok {
-			s.wg.Add(1)
 			s.running[id] = service
-			go func(svc LeaderService, svcID string) {
-				s.l.Infoln("Starting", svcID)
-				err := svc.Start(ctx)
-				if err != nil {
-					s.l.Errorln(err)
-					s.removeService(svcID)
+			s.wg.Go(func(svc LeaderService, svcID string) func() {
+				return func() {
+					s.l.Infoln("Starting", svcID)
+					err := svc.Start(ctx)
+					if err != nil {
+						s.l.Errorln(err)
+						s.removeService(svcID)
+					}
 				}
-			}(service, id)
+			}(service, id))
 		}
 	}
 }
@@ -88,7 +89,6 @@ func (s *services) StopRunningServices() {
 		s.l.Infoln("Stopping", service.ID())
 		service.Stop()
 		delete(s.running, id)
-		s.wg.Done()
 	}
 }
 
@@ -104,5 +104,4 @@ func (s *services) removeService(id string) {
 	s.rw.Lock()
 	defer s.rw.Unlock()
 	delete(s.running, id)
-	s.wg.Done()
 }