diff options
| author | Dan Engelbrecht <[email protected]> | 2025-11-10 16:25:22 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-11-10 16:25:22 +0100 |
| commit | 5f03c505686d26b45855eba189ea92f90cf26cf6 (patch) | |
| tree | 87aeb2aa74a81dea0a5654ef992dedea590905b6 /src | |
| parent | 5.7.9-pre12 (diff) | |
| download | zen-5f03c505686d26b45855eba189ea92f90cf26cf6.tar.xz zen-5f03c505686d26b45855eba189ea92f90cf26cf6.zip | |
fix lost assume-http2 option when resolving host in zen builds / project commands (#642)
Diffstat (limited to 'src')
| -rw-r--r-- | src/zen/cmds/builds_cmd.cpp | 11 | ||||
| -rw-r--r-- | src/zen/cmds/projectstore_cmd.cpp | 9 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp index 4c427fc7f..213b1bffa 100644 --- a/src/zen/cmds/builds_cmd.cpp +++ b/src/zen/cmds/builds_cmd.cpp @@ -3008,8 +3008,15 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) ResolveBuildStorage(ClientSettings, m_Host, m_OverrideHost, m_ZenCacheHost, ZenCacheResolveMode::All); if (!ResolveRes.HostUrl.empty()) { - Result.BuildStorageHttp = - std::make_unique<HttpClient>(ResolveRes.HostUrl, ClientSettings, []() { return AbortFlag.load(); }); + Result.BuildStorageHttp = std::make_unique<HttpClient>(ResolveRes.HostUrl, + HttpClientSettings{.LogCategory = "httpbuildsclient", + .ConnectTimeout = std::chrono::milliseconds{3000}, + .Timeout = std::chrono::milliseconds{30000}, + .AssumeHttp2 = ResolveRes.HostAssumeHttp2, + .AllowResume = true, + .RetryCount = 2, + .Verbose = m_VerboseHttp}, + []() { return AbortFlag.load(); }); Result.BuildStorage = CreateJupiterBuildStorage(Log(), *Result.BuildStorageHttp, diff --git a/src/zen/cmds/projectstore_cmd.cpp b/src/zen/cmds/projectstore_cmd.cpp index fe8c0d675..2bc5d0d4a 100644 --- a/src/zen/cmds/projectstore_cmd.cpp +++ b/src/zen/cmds/projectstore_cmd.cpp @@ -2440,7 +2440,14 @@ OplogDownloadCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a StorageInstance Storage; - Storage.BuildStorageHttp = std::make_unique<HttpClient>(ResolveRes.HostUrl, ClientSettings); + Storage.BuildStorageHttp = std::make_unique<HttpClient>(ResolveRes.HostUrl, + HttpClientSettings{.LogCategory = "httpbuildsclient", + .ConnectTimeout = std::chrono::milliseconds{3000}, + .Timeout = std::chrono::milliseconds{30000}, + .AssumeHttp2 = ResolveRes.HostAssumeHttp2, + .AllowResume = true, + .RetryCount = 2, + .Verbose = false}); BuildStorageCache::Statistics StorageCacheStats; |