diff options
| author | Stefan Boberg <[email protected]> | 2021-11-18 19:25:31 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-11-18 19:25:31 +0100 |
| commit | f74d55e41daa9f95b45cf5f4cd195664f1502bf0 (patch) | |
| tree | 26f8e59741a7b72893aacc6ffd7ad7bd61341042 /zenserver/compute/apply.cpp | |
| parent | explicitly delete some unnecessary class members to ensure proper usage (diff) | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-f74d55e41daa9f95b45cf5f4cd195664f1502bf0.tar.xz zen-f74d55e41daa9f95b45cf5f4cd195664f1502bf0.zip | |
merged from 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 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)", |