From f63824c2b2ca978780192587111024a8dfb0a7a2 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Wed, 1 Jun 2022 23:31:14 +0200 Subject: keep "reason" from upstream response so we can present it even if the request fails without outright error --- zenserver/upstream/zen.cpp | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) 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(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(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 -- cgit v1.2.3 From 0d739b955848725a77f818ac32db7b518fd7f878 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Thu, 2 Jun 2022 00:13:15 +0200 Subject: add timeout on pr validation --- .github/workflows/self_host_build.yml | 2 ++ 1 file changed, 2 insertions(+) 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: -- cgit v1.2.3