Merge pull request #743 from ystia/bugfix/GH-741-log-output-handler-err

Fixed name of variable containing the error of script output hander stop
ystia · May 25, 2021 · e8759d1 · e8759d1
2 parents dc281ef + 1c1021f
commit e8759d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### BUG FIXES
 
+* 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))
 * Workflow with asynchronous action never stops after another step failure  ([GH-733](https://github.com/ystia/yorc/issues/733))
 

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)