Merge pull request #117 from linxia/master

Write logs before sending result to the channel
adobe-platform · Oct 14, 2016 · 0d7dd6f · 0d7dd6f
2 parents d55179c + acf84f2
commit 0d7dd6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+**v2.4.2**
+
+- fix missing or incomplete hook logs
+
 **v2.4.1**
 
 - gather hook log output by hook since they run concurrently

diff --git a/hook/hook.go b/hook/hook.go
@@ -215,12 +215,13 @@ func ExecuteWithRunCapture(log log15.Logger,
 				var regionLogOutput bytes.Buffer
 				logger.SetHandler(log, &regionLogOutput)
 
-				successChan <- runner.runConfigHooks(log, &regionLogOutput, hooks, runArgs)
+				hooksResult := runner.runConfigHooks(log, &regionLogOutput, hooks, runArgs)
 
 				regionLogMutex.Lock()
 				regionLogOutput.WriteTo(os.Stdout)
 				regionLogMutex.Unlock()
 
+				successChan <- hooksResult
 			}(hookRunner, log, configHooks, runArgs)
 		}
 
@@ -292,11 +293,13 @@ func (recv *regionHookRunner) runConfigHooks(log log15.Logger,
 		var hookLogOutput bytes.Buffer
 		logger.SetHandler(log, &hookLogOutput)
 
-		successChan <- recv.runConfigHook(log, &hookLogOutput, hookIndex, hook, runArgs)
+		hookResult := recv.runConfigHook(log, &hookLogOutput, hookIndex, hook, runArgs)
 
 		hookLogMutex.Lock()
 		hookLogOutput.WriteTo(regionLogOutput)
 		hookLogMutex.Unlock()
+
+		successChan <- hookResult
 	}
 
 	for hookIndex, hook := range hooks {