Skip to content

Commit

Permalink
Merge pull request #744 from ystia/backport40/bugfix/GH-741-log-outpu…
Browse files Browse the repository at this point in the history
…t-handler-err

[Backport 4.0 ] Yorc panics attempting to print an error handling a script execution stdout
  • Loading branch information
laurentganne authored May 25, 2021
2 parents 305fe13 + 89a7aa9 commit 32f91cd
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 @@ -4,6 +4,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))

## 4.0.7 (May 19, 2021)
Expand Down
2 changes: 1 addition & 1 deletion prov/ansible/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,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 32f91cd

Please sign in to comment.