diff options
| author | Dan Engelbrecht <[email protected]> | 2022-04-26 10:46:38 +0200 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-04-26 10:46:38 +0200 |
| commit | bd5b1a15f65f2fde3721acd16ce3a316c03583ea (patch) | |
| tree | dfa0acea7237697cbdf14a1fa2bc121a060f6ec7 /zenserver/zenserver.cpp | |
| parent | Merge branch 'main' into de/cache-with-block-store (diff) | |
| parent | Compute tweaks (#78) (diff) | |
| download | zen-bd5b1a15f65f2fde3721acd16ce3a316c03583ea.tar.xz zen-bd5b1a15f65f2fde3721acd16ce3a316c03583ea.zip | |
Merge remote-tracking branch 'origin/main' into de/cache-with-block-store
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 3ac5b9992..abaec888a 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -850,7 +850,7 @@ ZenServer::InitializeCompute(const ZenServerOptions& ServerOptions) const ZenUpstreamCacheConfig& UpstreamConfig = ServerOptions.UpstreamCacheConfig; // Horde compute upstream - if (UpstreamConfig.HordeConfig.Url.empty() == false && UpstreamConfig.JupiterConfig.Url.empty() == false) + if (UpstreamConfig.HordeConfig.Url.empty() == false && UpstreamConfig.HordeConfig.StorageUrl.empty() == false) { ZEN_INFO("instantiating compute service"); @@ -861,8 +861,7 @@ ZenServer::InitializeCompute(const ZenServerOptions& ServerOptions) .ServiceUrl = UpstreamConfig.HordeConfig.Url, .ComputeCluster = UpstreamConfig.HordeConfig.Cluster, .ConnectTimeout = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds), - .Timeout = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds), - .UseLegacyDdc = false}; + .Timeout = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds)}; auto ComputeAuthConfig = zen::UpstreamAuthConfig{.OAuthUrl = UpstreamConfig.HordeConfig.OAuthUrl, .OAuthClientId = UpstreamConfig.HordeConfig.OAuthClientId, @@ -872,16 +871,16 @@ ZenServer::InitializeCompute(const ZenServerOptions& ServerOptions) auto StorageOptions = zen::CloudCacheClientOptions{.Name = EndpointName, - .ServiceUrl = UpstreamConfig.JupiterConfig.Url, + .ServiceUrl = UpstreamConfig.HordeConfig.StorageUrl, .BlobStoreNamespace = UpstreamConfig.HordeConfig.Namespace, .ConnectTimeout = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds), .Timeout = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds)}; - auto StorageAuthConfig = zen::UpstreamAuthConfig{.OAuthUrl = UpstreamConfig.JupiterConfig.OAuthUrl, - .OAuthClientId = UpstreamConfig.JupiterConfig.OAuthClientId, - .OAuthClientSecret = UpstreamConfig.JupiterConfig.OAuthClientSecret, - .OpenIdProvider = UpstreamConfig.JupiterConfig.OpenIdProvider, - .AccessToken = UpstreamConfig.JupiterConfig.AccessToken}; + auto StorageAuthConfig = zen::UpstreamAuthConfig{.OAuthUrl = UpstreamConfig.HordeConfig.StorageOAuthUrl, + .OAuthClientId = UpstreamConfig.HordeConfig.StorageOAuthClientId, + .OAuthClientSecret = UpstreamConfig.HordeConfig.StorageOAuthClientSecret, + .OpenIdProvider = UpstreamConfig.HordeConfig.StorageOpenIdProvider, + .AccessToken = UpstreamConfig.HordeConfig.StorageAccessToken}; m_HttpFunctionService = std::make_unique<zen::HttpFunctionService>(*m_CasStore, *m_CidStore, @@ -893,7 +892,7 @@ ZenServer::InitializeCompute(const ZenServerOptions& ServerOptions) } else { - ZEN_INFO("NOT instantiating compute service (missing Horde or Jupiter config)"); + ZEN_INFO("NOT instantiating compute service (missing Horde or Storage config)"); } } #endif // ZEN_WITH_COMPUTE_SERVICES |