diff options
| author | Dan Engelbrecht <[email protected]> | 2023-08-09 13:27:52 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-09 13:27:52 +0200 |
| commit | 6132ee22dba626e221e615addb780b5f2a5a7bf9 (patch) | |
| tree | 410857cb939611cd8353eb347ed266734e907a90 /src/zenserver/projectstore | |
| parent | handle exception in asio header parsing (#348) (diff) | |
| download | zen-6132ee22dba626e221e615addb780b5f2a5a7bf9.tar.xz zen-6132ee22dba626e221e615addb780b5f2a5a7bf9.zip | |
Add `--assume-http2` option to cloud style import/export command to use a HTTP/2 endpoint without without HTTP/1.1 upgrade (#347)
Diffstat (limited to 'src/zenserver/projectstore')
| -rw-r--r-- | src/zenserver/projectstore/jupiterremoteprojectstore.cpp | 3 | ||||
| -rw-r--r-- | src/zenserver/projectstore/jupiterremoteprojectstore.h | 1 | ||||
| -rw-r--r-- | src/zenserver/projectstore/projectstore.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp index 08c8aa0e6..b1a68c6d2 100644 --- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp +++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp @@ -252,7 +252,8 @@ 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(60000), + .AssumeHttp2 = Options.AssumeHttp2}; // 1) Access token as parameter in request // 2) Environment variable (different win vs linux/mac) // 3) openid-provider (assumes oidctoken.exe -Zen true has been run with matching Options.OpenIdProvider diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.h b/src/zenserver/projectstore/jupiterremoteprojectstore.h index 697379acb..f2375a730 100644 --- a/src/zenserver/projectstore/jupiterremoteprojectstore.h +++ b/src/zenserver/projectstore/jupiterremoteprojectstore.h @@ -19,6 +19,7 @@ struct JupiterRemoteStoreOptions : RemoteStoreOptions AuthMgr& AuthManager; bool ForceDisableBlocks = false; bool ForceDisableTempBlocks = false; + bool AssumeHttp2 = false; }; std::unique_ptr<RemoteProjectStore> CreateJupiterRemoteStore(const JupiterRemoteStoreOptions& Options); diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp index ae6f0d1d8..e5088e11d 100644 --- a/src/zenserver/projectstore/projectstore.cpp +++ b/src/zenserver/projectstore/projectstore.cpp @@ -148,6 +148,7 @@ namespace { } bool ForceDisableBlocks = Cloud["disableblocks"sv].AsBool(false); bool ForceDisableTempBlocks = Cloud["disabletempblocks"sv].AsBool(false); + bool AssumeHttp2 = Cloud["assumehttp2"sv].AsBool(false); JupiterRemoteStoreOptions Options = {RemoteStoreOptions{.MaxBlockSize = MaxBlockSize, .MaxChunkEmbedSize = MaxChunkEmbedSize}, Url, @@ -158,7 +159,8 @@ namespace { AccessToken, AuthManager, ForceDisableBlocks, - ForceDisableTempBlocks}; + ForceDisableTempBlocks, + AssumeHttp2}; RemoteStore = CreateJupiterRemoteStore(Options); } |