diff options
| author | Per Larsson <[email protected]> | 2021-11-18 18:50:20 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-11-18 18:50:20 +0100 |
| commit | 625226d0eab6025a4d8b9a7194b21e01485371dd (patch) | |
| tree | 6e31359491a229b76b1ab7cf577e196b3a69d4de | |
| parent | Extended Health endpoint with support for returning build version and log file. (diff) | |
| parent | Add errorcode to output when a task fails (diff) | |
| download | zen-625226d0eab6025a4d8b9a7194b21e01485371dd.tar.xz zen-625226d0eab6025a4d8b9a7194b21e01485371dd.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
| -rw-r--r-- | zenserver/compute/apply.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp index 8ad14a1ed..1f18b054f 100644 --- a/zenserver/compute/apply.cpp +++ b/zenserver/compute/apply.cpp @@ -924,15 +924,16 @@ HttpFunctionService::ExecActionUpstreamResult(const IoHash& WorkerId, const IoHa GetUpstreamApplyResult& Completed = Status.Status.Result; if (!Completed.Success || Completed.Error.ErrorCode != 0) { - ZEN_ERROR("Action {}/{} failed:\n stdout: {} \n stderr: {} \n reason: {}", + ZEN_ERROR("Action {}/{} failed:\n stdout: {}\n stderr: {}\n reason: {}\n errorcode: {}", WorkerId.ToHexString(), ActionId.ToHexString(), Completed.StdOut, Completed.StdErr, - Completed.Error.Reason); - // throw std::runtime_error( - // "Action {}/{} failed: {}"_format(WorkerId.ToHexString(), ActionId.ToHexString(), Completed.Error.Reason).c_str()); - return HttpResponseCode::BadRequest; + Completed.Error.Reason, + Completed.Error.ErrorCode); + + throw std::runtime_error( + "Action {}/{} failed"_format(WorkerId.ToHexString(), ActionId.ToHexString()).c_str()); } ZEN_INFO("Action {}/{} completed with {} attachments ({} compressed, {} uncompressed)", |