diff options
| author | Stefan Boberg <[email protected]> | 2021-09-08 16:14:51 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-08 16:14:51 +0200 |
| commit | 5f1146d00ff545ddb00e0f26784ee468b09b0efb (patch) | |
| tree | 49c0007460c1fc924647f1f072971c08d3956f36 /zenserver/upstream/jupiter.cpp | |
| parent | Changed logging defaults to be more suitable for production (diff) | |
| parent | Minor fixup and formatting. (diff) | |
| download | zen-5f1146d00ff545ddb00e0f26784ee468b09b0efb.tar.xz zen-5f1146d00ff545ddb00e0f26784ee468b09b0efb.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zenserver/upstream/jupiter.cpp')
| -rw-r--r-- | zenserver/upstream/jupiter.cpp | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp index 9a013963a..815e9014e 100644 --- a/zenserver/upstream/jupiter.cpp +++ b/zenserver/upstream/jupiter.cpp @@ -80,15 +80,12 @@ CloudCacheSession::GetDerivedData(std::string_view BucketId, std::string_view Ke Session.SetOption(cpr::Header{{"Authorization", Auth}}); cpr::Response Response = Session.Get(); - m_Log.debug("GET {}", Response); + + const bool Success = Response.status_code == 200; + const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); - if (Response.status_code == 200) - { - return {IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()), true}; - } - - return {.Success = false}; + return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; } CloudCacheResult @@ -116,12 +113,10 @@ CloudCacheSession::GetRef(std::string_view BucketId, const IoHash& Key, ZenConte cpr::Response Response = Session.Get(); m_Log.debug("GET {}", Response); - if (Response.status_code == 200) - { - return {IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()), true}; - } + const bool Success = Response.status_code == 200; + const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); - return {.Success = false}; + return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; } CloudCacheResult @@ -141,12 +136,10 @@ CloudCacheSession::GetCompressedBlob(const IoHash& Key) cpr::Response Response = Session.Get(); m_Log.debug("GET {}", Response); - if (Response.status_code == 200) - { - return {IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()), true}; - } + const bool Success = Response.status_code == 200; + const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); - return {.Success = false}; + return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; } CloudCacheResult @@ -170,7 +163,7 @@ CloudCacheSession::PutDerivedData(std::string_view BucketId, std::string_view Ke cpr::Response Response = Session.Put(); m_Log.debug("PUT {}", Response); - return {.Success = Response.status_code == 200}; + return {.Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200}; } CloudCacheResult @@ -201,7 +194,7 @@ CloudCacheSession::PutRef(std::string_view BucketId, const IoHash& Key, IoBuffer cpr::Response Response = Session.Put(); m_Log.debug("PUT {}", Response); - return {.Success = Response.status_code == 200}; + return {.Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200}; } CloudCacheResult @@ -222,7 +215,7 @@ CloudCacheSession::PutCompressedBlob(const IoHash& Key, IoBuffer Blob) cpr::Response Response = Session.Put(); m_Log.debug("PUT {}", Response); - return {.Success = Response.status_code == 200}; + return {.Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200}; } std::vector<IoHash> |