diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/zenserver/projectstore/jupiterremoteprojectstore.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 45102c664..622e7bf66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## - Bugfix: Respect result from FinalizeRef in Jupiter oplog upload where it requests missing attachments +- Improvement: Increase timeout when doing import/export of oplogs to jupiter to 30 min per request - Improvement: Better logging/progress report on oplog export - Improvement: Ignore OOM errors in spdlog, just drop the error since we can't do anything useful if we run out of memory here - Improvement: Try to catch any exceptions in spdlog error handling to avoid abort termination of process diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp index cfe273eba..fbc3c8e16 100644 --- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp +++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp @@ -294,7 +294,7 @@ CreateJupiterRemoteStore(const JupiterRemoteStoreOptions& Options, const std::fi CloudCacheClientOptions ClientOptions{.Name = "Remote store"sv, .ServiceUrl = Url, .ConnectTimeout = std::chrono::milliseconds(2000), - .Timeout = std::chrono::milliseconds(180000), + .Timeout = std::chrono::milliseconds(1800000), .AssumeHttp2 = Options.AssumeHttp2}; // 1) Access token as parameter in request // 2) Environment variable (different win vs linux/mac) |