Centralized the lineCallbackWaitGroup to the line scanner go-routine

process/process.go

@@ -59,7 +59,6 @@ func (p *Process) Start() error {
 	p.command.Env = append(currentEnv, p.Env...)
 
 	var waitGroup sync.WaitGroup
-	var lineCallbackWaitGroup sync.WaitGroup
 
 	lineReaderPipe, lineWriterPipe := io.Pipe()
 
@@ -128,6 +127,7 @@ func (p *Process) Start() error {
 		reader := bufio.NewReader(lineReaderPipe)
 
 		var appending []byte
+		var lineCallbackWaitGroup sync.WaitGroup
 
 		for {
 			line, isPrefix, err := reader.ReadLine()
@@ -174,8 +174,12 @@ func (p *Process) Start() error {
 			}(string(line))
 		}
 
-		logger.Debug("[LineScanner] Finished")
+		// We need to make sure all the line callbacks have finish before
+		// finish up the process
+		logger.Debug("[LineScanner] Waiting for callbacks to finish")
+		lineCallbackWaitGroup.Wait()
 
+		logger.Debug("[LineScanner] Finished")
 		waitGroup.Done()
 	}()
 
@@ -205,11 +209,6 @@ func (p *Process) Start() error {
 		logger.Debug("[Process] Timed out waiting for wait group: (%T: %v)", err, err)
 	}
 
-	// We need to make sure all the line callbacks have finish before
-	// finish up the process
-	logger.Debug("[Process] Waiting for line callbacks to finish")
-	lineCallbackWaitGroup.Wait()
-
 	// No error occurred so we can return nil
 	return nil
 }