From 8a6e33b02598764d3bab8f73fde159e32d6cbf42 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sat, 2 Mar 2024 13:07:34 -0800
Subject: [PATCH] refactor: smaller functions

---
 src/app/project_runner.go | 97 +++++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/app/project_runner.go b/src/app/project_runner.go
index da69eb8..8b28262 100644
--- a/src/app/project_runner.go
+++ b/src/app/project_runner.go
@@ -346,6 +346,57 @@ func (p *ProjectRunner) runningProcessesReverseDependencies() map[string]map[str
 	return reverseDependencies
 }
 
+func (p *ProjectRunner) shutDownInOrder(wg *sync.WaitGroup, shutdownOrder []*Process) {
+	reverseDependencies := p.runningProcessesReverseDependencies()
+	for _, process := range shutdownOrder {
+		wg.Add(1)
+		go func(proc *Process) {
+			defer wg.Done()
+			waitForDepsWg := sync.WaitGroup{}
+			if revDeps, ok := reverseDependencies[proc.getName()]; ok {
+				for _, runningProc := range revDeps {
+					waitForDepsWg.Add(1)
+					go func(pr *Process) {
+						pr.waitForCompletion()
+						waitForDepsWg.Done()
+					}(runningProc)
+				}
+			}
+			waitForDepsWg.Wait()
+			log.Debug().Msgf("[%s]: waited for all dependencies to shut down", proc.getName())
+
+			err := proc.shutDown()
+			if err != nil {
+				log.Err(err).Msgf("failed to shutdown %s", proc.getName())
+				return
+			}
+			proc.waitForCompletion()
+		}(process)
+	}
+}
+
+func (p *ProjectRunner) shutDownAndWait(shutdownOrder []*Process) {
+	wg := sync.WaitGroup{}
+	if p.isOrderedShutDown {
+		p.shutDownInOrder(&wg, shutdownOrder)
+	} else {
+		for _, proc := range shutdownOrder {
+			err := proc.shutDown()
+			if err != nil {
+				log.Err(err).Msgf("failed to shutdown %s", proc.getName())
+				continue
+			}
+			wg.Add(1)
+			go func(pr *Process) {
+				pr.waitForCompletion()
+				wg.Done()
+			}(proc)
+		}
+	}
+
+	wg.Wait()
+}
+
 func (p *ProjectRunner) ShutDownProject() error {
 	p.runProcMutex.Lock()
 	defer p.runProcMutex.Unlock()
@@ -377,51 +428,7 @@ func (p *ProjectRunner) ShutDownProject() error {
 		proc.prepareForShutDown()
 	}
 
-	wg := sync.WaitGroup{}
-	if p.isOrderedShutDown {
-		reverseDependencies := p.runningProcessesReverseDependencies()
-		for _, process := range shutdownOrder {
-			wg.Add(1)
-			go func(proc *Process) {
-				defer wg.Done()
-				waitForDepsWg := sync.WaitGroup{}
-				if revDeps, ok := reverseDependencies[proc.getName()]; ok {
-					for _, runningProc := range revDeps {
-						waitForDepsWg.Add(1)
-						go func(pr *Process) {
-							pr.waitForCompletion()
-							waitForDepsWg.Done()
-						}(runningProc)
-					}
-				}
-				waitForDepsWg.Wait()
-				log.Debug().Msgf("[%s]: waited for all dependencies to shut down", proc.getName())
-
-				err := proc.shutDown()
-				if err != nil {
-					log.Err(err).Msgf("failed to shutdown %s", proc.getName())
-					return
-				}
-				proc.waitForCompletion()
-			}(process)
-		}
-	} else {
-		for _, proc := range shutdownOrder {
-			err := proc.shutDown()
-			if err != nil {
-				log.Err(err).Msgf("failed to shutdown %s", proc.getName())
-				continue
-			}
-			wg.Add(1)
-			go func(pr *Process) {
-				pr.waitForCompletion()
-				wg.Done()
-			}(proc)
-		}
-
-	}
-
-	wg.Wait()
+	p.shutDownAndWait(shutdownOrder)
 	return nil
 }