diff options
| author | Dan Engelbrecht <[email protected]> | 2023-08-10 16:59:43 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-10 16:59:43 +0200 |
| commit | 156612bbc5e644ba8d34d8f71c375e508ce003b7 (patch) | |
| tree | 44143a6e2c2127e2d2bccb60bf3dfefe40411984 /src/zenserver/projectstore | |
| parent | Allow oplog file mapping where ServerPath is missing if a attachment hash is ... (diff) | |
| download | zen-156612bbc5e644ba8d34d8f71c375e508ce003b7.tar.xz zen-156612bbc5e644ba8d34d8f71c375e508ce003b7.zip | |
Add `response.text` to output in log when jupiter request fails (#354)
* Add `response.text` to output in log when jupiter request fails
* only hash jupiter ref once and keep that
* Increase request timeout when uploading to Jupiter to 2 min (to handle very large attachments)
* changelog
Diffstat (limited to 'src/zenserver/projectstore')
| -rw-r--r-- | src/zenserver/projectstore/jupiterremoteprojectstore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp index b1a68c6d2..a7bf25ad6 100644 --- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp +++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp @@ -55,7 +55,7 @@ public: } } - SaveResult Result{ConvertResult(PutResult), {PutResult.Needs.begin(), PutResult.Needs.end()}, IoHash::HashBuffer(Payload)}; + SaveResult Result{ConvertResult(PutResult), {PutResult.Needs.begin(), PutResult.Needs.end()}, PutResult.RawHash}; if (Result.ErrorCode) { Result.Reason = fmt::format("Failed saving oplog container to {}/{}/{}/{}. Reason: '{}'", @@ -252,7 +252,7 @@ CreateJupiterRemoteStore(const JupiterRemoteStoreOptions& Options) CloudCacheClientOptions ClientOptions{.Name = "Remote store"sv, .ServiceUrl = Url, .ConnectTimeout = std::chrono::milliseconds(2000), - .Timeout = std::chrono::milliseconds(60000), + .Timeout = std::chrono::milliseconds(120000), .AssumeHttp2 = Options.AssumeHttp2}; // 1) Access token as parameter in request // 2) Environment variable (different win vs linux/mac) |