From 8db5e14a2bcae1d87fa2a210db8bc8b8d0a1aaf1 Mon Sep 17 00:00:00 2001 From: Lin Xia Date: Thu, 13 Oct 2016 16:36:44 -0700 Subject: [PATCH 1/3] Write logs before sending result to the channel --- hook/hook.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hook/hook.go b/hook/hook.go index d76a28a..5aceb5c 100644 --- a/hook/hook.go +++ b/hook/hook.go @@ -215,12 +215,14 @@ func ExecuteWithRunCapture(log log15.Logger, var regionLogOutput bytes.Buffer logger.SetHandler(log, ®ionLogOutput) - successChan <- runner.runConfigHooks(log, ®ionLogOutput, hooks, runArgs) + hooksResult := runner.runConfigHooks(log, ®ionLogOutput, hooks, runArgs) regionLogMutex.Lock() regionLogOutput.WriteTo(os.Stdout) regionLogMutex.Unlock() + successChan <- hooksResult + }(hookRunner, log, configHooks, runArgs) } From 6571a448f0424f982d501c87e4dfa99437cf3f92 Mon Sep 17 00:00:00 2001 From: Lin Xia Date: Thu, 13 Oct 2016 16:41:31 -0700 Subject: [PATCH 2/3] one more place --- hook/hook.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hook/hook.go b/hook/hook.go index 5aceb5c..d35d208 100644 --- a/hook/hook.go +++ b/hook/hook.go @@ -222,7 +222,6 @@ func ExecuteWithRunCapture(log log15.Logger, regionLogMutex.Unlock() successChan <- hooksResult - }(hookRunner, log, configHooks, runArgs) } @@ -294,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 { From acf84f2d029b0400ddd0edd421db8c870f98bf1f Mon Sep 17 00:00:00 2001 From: Lin Xia Date: Thu, 13 Oct 2016 16:47:23 -0700 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af69634..94b0197 100644 --- 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