Merge pull request #750 from ystia:backport41/bugfix/GH-741-log-outpu…

…t-handler-err [Backport 4.1 ] Yorc panics attempting to print an error handling a script execution stdout
ystia · Jun 11, 2021 · 96ca45a · 96ca45a
2 parents 5d862bb + 89a1407
commit 96ca45a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### BUG FIXES
 
 * Over-consumption of Consul connections ([GH-745](https://github.com/ystia/yorc/issues/745))
+* Yorc panics attempting to print an error handling a script execution stdout ([GH-741](https://github.com/ystia/yorc/issues/741))
 * Error submitting a SLURM job with no execution option ([GH-739](https://github.com/ystia/yorc/issues/739))
 
 ## 4.1.1 (May 06, 2021)

diff --git a/prov/ansible/execution.go b/prov/ansible/execution.go
@@ -1267,7 +1267,7 @@ func (e *executionCommon) executePlaybook(ctx context.Context, retry bool,
 
 	err := cmd.Run()
 	if handlerErr := handler.stop(); handlerErr != nil {
-		log.Printf("Error stopping output handler: %s", err.Error())
+		log.Printf("Error stopping output handler: %s", handlerErr.Error())
 	}
 	if err != nil {
 		return e.checkAnsibleRetriableError(ctx, err)