Skip to content

Commit

Permalink
Merge pull request #743 from ystia/bugfix/GH-741-log-output-handler-err
Browse files Browse the repository at this point in the history
Fixed name of variable containing the error of script output hander stop
  • Loading branch information
laurentganne committed May 25, 2021
2 parents dc281ef + 1c1021f commit e8759d1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion prov/ansible/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e8759d1

Please sign in to comment.