diff options
| author | Martin Ridgers <[email protected]> | 2021-11-22 09:13:27 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-22 09:13:27 +0100 |
| commit | be52dec8e8c1c5d3901d9f6d742c626931abff27 (patch) | |
| tree | a832df6ed494ea770fec3ee57a258d3cc9384a13 /zenserver/compute/apply.cpp | |
| parent | Initial integration of Trace from UE5 via the --zentrace=y xmake config (diff) | |
| parent | Comment out unused variables to fix warnings. (diff) | |
| download | zen-be52dec8e8c1c5d3901d9f6d742c626931abff27.tar.xz zen-be52dec8e8c1c5d3901d9f6d742c626931abff27.zip | |
Merged main
Diffstat (limited to 'zenserver/compute/apply.cpp')
| -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 9d8ac47a2..1db3fe631 100644 --- a/zenserver/compute/apply.cpp +++ b/zenserver/compute/apply.cpp @@ -947,15 +947,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::NotFound; + 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)", |