diff options
| author | Dan Engelbrecht <[email protected]> | 2022-06-02 00:34:18 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-02 00:34:18 +0200 |
| commit | 8513d26876ff45d5df49ac336229b4151cd1c1a8 (patch) | |
| tree | a9b4917227a833206deeebd0e9dc72211843980c | |
| parent | Merge pull request #117 from EpicGames/de/configurable-gc-monitor-intervall (diff) | |
| parent | add timeout on pr validation (diff) | |
| download | zen-8513d26876ff45d5df49ac336229b4151cd1c1a8.tar.xz zen-8513d26876ff45d5df49ac336229b4151cd1c1a8.zip | |
Merge pull request #118 from EpicGames/de/keep-zen-upstream-response
keep "reason" from upstream response
| -rw-r--r-- | .github/workflows/self_host_build.yml | 2 | ||||
| -rw-r--r-- | zenserver/upstream/zen.cpp | 28 |
2 files changed, 21 insertions, 9 deletions
diff --git a/.github/workflows/self_host_build.yml b/.github/workflows/self_host_build.yml index 8bb57a4b4..b728e33c3 100644 --- a/.github/workflows/self_host_build.yml +++ b/.github/workflows/self_host_build.yml @@ -23,6 +23,7 @@ jobs: windows-build: name: Build Windows runs-on: [self-hosted, windows, x64] + timeout-minutes: 10 strategy: matrix: config: @@ -71,6 +72,7 @@ jobs: linux-build: name: Build Linux runs-on: [self-hosted, linux, x64] + timeout-minutes: 10 strategy: matrix: config: diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp index 8fc1503c7..0237ec346 100644 --- a/zenserver/upstream/zen.cpp +++ b/zenserver/upstream/zen.cpp @@ -465,7 +465,11 @@ ZenStructuredCacheSession::GetCacheValue(std::string_view, std::string_view Buck const bool Success = Response.status_code == 200; const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); - return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; + return {.Response = Buffer, + .Bytes = Response.downloaded_bytes, + .ElapsedSeconds = Response.elapsed, + .Reason = Response.reason, + .Success = Success}; } ZenCacheResult @@ -501,9 +505,8 @@ ZenStructuredCacheSession::PutCacheRecord(std::string_view, return {.ErrorCode = static_cast<int32_t>(Response.error.code), .Reason = std::move(Response.error.message)}; } - return {.Bytes = Response.uploaded_bytes, - .ElapsedSeconds = Response.elapsed, - .Success = (Response.status_code == 200 || Response.status_code == 201)}; + const bool Success = Response.status_code == 200 || Response.status_code == 201; + return {.Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Reason = Response.reason, .Success = Success}; } ZenCacheResult @@ -536,9 +539,8 @@ ZenStructuredCacheSession::PutCacheValue(std::string_view, return {.ErrorCode = static_cast<int32_t>(Response.error.code), .Reason = std::move(Response.error.message)}; } - return {.Bytes = Response.uploaded_bytes, - .ElapsedSeconds = Response.elapsed, - .Success = (Response.status_code == 200 || Response.status_code == 201)}; + const bool Success = Response.status_code == 200 || Response.status_code == 201; + return {.Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Reason = Response.reason, .Success = Success}; } ZenCacheResult @@ -567,7 +569,11 @@ ZenStructuredCacheSession::InvokeRpc(const CbObjectView& Request) const bool Success = Response.status_code == 200; const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); - return {.Response = std::move(Buffer), .Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; + return {.Response = std::move(Buffer), + .Bytes = Response.uploaded_bytes, + .ElapsedSeconds = Response.elapsed, + .Reason = Response.reason, + .Success = Success}; } ZenCacheResult @@ -595,7 +601,11 @@ ZenStructuredCacheSession::InvokeRpc(const CbPackage& Request) const bool Success = Response.status_code == 200; const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); - return {.Response = std::move(Buffer), .Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; + return {.Response = std::move(Buffer), + .Bytes = Response.uploaded_bytes, + .ElapsedSeconds = Response.elapsed, + .Reason = Response.reason, + .Success = Success}; } } // namespace zen |