Wait for process completion on SIGTERM

src/app/project_runner.go

@@ -241,9 +241,20 @@ func (p *ProjectRunner) ShutDownProject() {
 	for _, proc := range runProc {
 		proc.prepareForShutDown()
 	}
+	wg := sync.WaitGroup{}
 	for _, proc := range runProc {
-		_ = proc.shutDown()
+		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) getProcessLog(name string) (*pclog.ProcessLogBuffer, error) {

src/cmd/project_runner.go

@@ -36,7 +36,7 @@ func runProject(process []string, noDeps bool) {
 
 func setSignal(signalHandler func()) {
 	cancelChan := make(chan os.Signal, 1)
-	signal.Notify(cancelChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGHUP)
+	signal.Notify(cancelChan, syscall.SIGTERM, os.Interrupt, syscall.SIGHUP)
 	go func() {
 		sig := <-cancelChan
 		log.Info().Msgf("Caught %v - Shutting down the running processes...", sig)

src/pclog/logger_facade.go

@@ -14,6 +14,7 @@ type PCLog struct {
 	file         *os.File
 	logEventChan chan logEvent
 	wg           sync.WaitGroup
+	closer       sync.Once
 }
 
 type logEvent struct {
@@ -73,10 +74,12 @@ func (l *PCLog) error(message string, process string, replica int) {
 }
 
 func (l *PCLog) Close() {
-	close(l.logEventChan)
-	l.wg.Wait()
-	l.writer.Flush()
-	l.file.Close()
+	l.closer.Do(func() {
+		close(l.logEventChan)
+		l.wg.Wait()
+		l.writer.Flush()
+		l.file.Close()
+	})
 }
 
 func (l *PCLog) runCollector() {