Added connect/transfer timeout options for Jupiter client.

7 files changed, 86 insertions, 76 deletions

diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 4caa5c8df..9223ea0f4 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -46,13 +46,20 @@ namespace detail {
 
 		void InvalidateAccessToken() { AccessToken = {}; }
 
-		void Reset()
+		void Reset(std::chrono::milliseconds ConnectTimeout, std::chrono::milliseconds Timeout)
 		{
 			Session.SetBody({});
 			Session.SetHeader({});
+			Session.SetConnectTimeout(ConnectTimeout);
+			Session.SetTimeout(Timeout);
 			AccessToken = GetAccessToken();
 		}
 
+		cpr::Session& GetSession() { return Session; }
+
+	private:
+		friend class CloudCacheClient;
+
 		CloudCacheClient&	  OwnerClient;
 		CloudCacheAccessToken AccessToken;
 		cpr::Session		  Session;
@@ -89,7 +96,7 @@ CloudCacheSession::GetDerivedData(std::string_view BucketId, std::string_view Ke
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/c/ddc/" << m_CacheClient->DdcNamespace() << "/" << BucketId << "/" << Key;
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/octet-stream"}});
@@ -133,7 +140,7 @@ CloudCacheSession::GetRef(std::string_view BucketId, const IoHash& Key, ZenConte
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/refs/" << m_CacheClient->BlobStoreNamespace() << "/" << BucketId << "/"
 		<< Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", ContentType}});
@@ -169,7 +176,7 @@ CloudCacheSession::GetBlob(const IoHash& Key)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/blobs/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/octet-stream"}});
@@ -206,7 +213,7 @@ CloudCacheSession::GetCompressedBlob(const IoHash& Key)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compressed-blobs/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/x-ue-comp"}});
@@ -242,7 +249,7 @@ CloudCacheSession::GetObject(const IoHash& Key)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/objects/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/x-ue-cb"}});
@@ -280,7 +287,7 @@ CloudCacheSession::PutDerivedData(std::string_view BucketId, std::string_view Ke
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/c/ddc/" << m_CacheClient->DdcNamespace() << "/" << BucketId << "/" << Key;
 
-	auto& Session = m_SessionState->Session;
+	auto& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value},
@@ -331,7 +338,7 @@ CloudCacheSession::PutRef(std::string_view BucketId, const IoHash& Key, IoBuffer
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/refs/" << m_CacheClient->BlobStoreNamespace() << "/" << BucketId << "/"
 		<< Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(
@@ -394,7 +401,7 @@ CloudCacheSession::FinalizeRef(std::string_view BucketId, const IoHash& Key, con
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/refs/" << m_CacheClient->BlobStoreNamespace() << "/" << BucketId << "/"
 		<< Key.ToHexString() << "/finalize/" << RefHash.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value},
@@ -454,7 +461,7 @@ CloudCacheSession::PutBlob(const IoHash& Key, IoBuffer Blob)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/blobs/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Content-Type", "application/octet-stream"}});
@@ -489,7 +496,7 @@ CloudCacheSession::PutCompressedBlob(const IoHash& Key, IoBuffer Blob)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compressed-blobs/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Content-Type", "application/x-ue-comp"}});
@@ -524,7 +531,7 @@ CloudCacheSession::PutObject(const IoHash& Key, IoBuffer Object)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/objects/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Content-Type", "application/x-ue-cb"}});
@@ -560,7 +567,7 @@ CloudCacheSession::RefExists(std::string_view BucketId, const IoHash& Key)
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/refs/" << m_CacheClient->BlobStoreNamespace() << "/" << BucketId << "/"
 		<< Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}});
@@ -629,7 +636,7 @@ CloudCacheSession::PostComputeTasks(std::string_view ChannelId, IoBuffer TasksDa
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compute/" << ChannelId;
 
-	auto& Session = m_SessionState->Session;
+	auto& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Content-Type", "application/x-ue-cb"}});
@@ -662,7 +669,7 @@ CloudCacheSession::GetComputeUpdates(std::string_view ChannelId, const uint32_t
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compute/" << ChannelId << "/updates?wait=" << WaitSeconds;
 
-	auto& Session = m_SessionState->Session;
+	auto& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/x-ue-cb"}});
@@ -697,7 +704,7 @@ CloudCacheSession::GetObjectTree(const IoHash& Key)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/objects/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString() << "/tree";
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/octet-stream"}});
@@ -761,7 +768,7 @@ CloudCacheSession::CacheTypeExists(std::string_view TypeId, const IoHash& Key)
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/" << TypeId << "/" << m_CacheClient->BlobStoreNamespace() << "/" << Key.ToHexString();
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}});
@@ -799,7 +806,7 @@ CloudCacheSession::CacheTypeExists(std::string_view TypeId, const std::set<IoHas
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/" << TypeId << "/" << m_CacheClient->BlobStoreNamespace() << "/exists?" << Query;
 
-	cpr::Session& Session = m_SessionState->Session;
+	cpr::Session& Session = m_SessionState->GetSession();
 
 	Session.SetOption(cpr::Url{Uri.c_str()});
 	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/x-ue-cb"}});
@@ -853,6 +860,8 @@ CloudCacheClient::CloudCacheClient(const CloudCacheClientOptions& Options)
 , m_OAuthClientId(Options.OAuthClientId)
 , m_OAuthSecret(Options.OAuthSecret)
 , m_AccessToken(Options.AccessToken)
+, m_ConnectTimeout(Options.ConnectTimeout)
+, m_Timeout(Options.Timeout)
 {
 	if (!Options.AccessToken.empty())
 	{
@@ -955,7 +964,7 @@ CloudCacheClient::AllocSessionState()
 		State = new detail::CloudCacheSessionState(*this);
 	}
 
-	State->Reset();
+	State->Reset(m_ConnectTimeout, m_Timeout);
 
 	return State;
 }
diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h
index 13d65587e..68c7361e0 100644
--- a/zenserver/upstream/jupiter.h
+++ b/zenserver/upstream/jupiter.h
@@ -132,14 +132,16 @@ private:
 
 struct CloudCacheClientOptions
 {
-	std::string_view ServiceUrl;
-	std::string_view DdcNamespace;
-	std::string_view BlobStoreNamespace;
-	std::string_view OAuthProvider;
-	std::string_view OAuthClientId;
-	std::string_view OAuthSecret;
-	std::string_view AccessToken;
-	bool			 UseLegacyDdc = false;
+	std::string_view		  ServiceUrl;
+	std::string_view		  DdcNamespace;
+	std::string_view		  BlobStoreNamespace;
+	std::string_view		  OAuthProvider;
+	std::string_view		  OAuthClientId;
+	std::string_view		  OAuthSecret;
+	std::string_view		  AccessToken;
+	std::chrono::milliseconds ConnectTimeout{5000};
+	std::chrono::milliseconds Timeout{};
+	bool					  UseLegacyDdc = false;
 };
 
 /**
@@ -160,17 +162,19 @@ public:
 	spdlog::logger& Logger() { return m_Log; }
 
 private:
-	spdlog::logger& m_Log;
-	std::string		m_ServiceUrl;
-	std::string		m_OAuthDomain;
-	std::string		m_OAuthUriPath;
-	std::string		m_OAuthFullUri;
-	std::string		m_DdcNamespace;
-	std::string		m_BlobStoreNamespace;
-	std::string		m_OAuthClientId;
-	std::string		m_OAuthSecret;
-	std::string		m_AccessToken;
-	bool			m_IsValid = false;
+	spdlog::logger&			  m_Log;
+	std::string				  m_ServiceUrl;
+	std::string				  m_OAuthDomain;
+	std::string				  m_OAuthUriPath;
+	std::string				  m_OAuthFullUri;
+	std::string				  m_DdcNamespace;
+	std::string				  m_BlobStoreNamespace;
+	std::string				  m_OAuthClientId;
+	std::string				  m_OAuthSecret;
+	std::string				  m_AccessToken;
+	std::chrono::milliseconds m_ConnectTimeout{};
+	std::chrono::milliseconds m_Timeout{};
+	bool					  m_IsValid = false;
 
 	RwLock									   m_SessionStateLock;
 	std::list<detail::CloudCacheSessionState*> m_SessionStateCache;
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index 2741e3e51..0290723f0 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -442,7 +442,7 @@ namespace detail {
 		};
 
 	public:
-		ZenUpstreamEndpoint(const ZenClientOptions& Options)
+		ZenUpstreamEndpoint(const ZenStructuredCacheClientOptions& Options)
 		: m_Log(zen::logging::Get("upstream"))
 		, m_DisplayName("ZEN")
 		, m_ConnectTimeout(Options.ConnectTimeout)
@@ -1354,7 +1354,7 @@ MakeJupiterUpstreamEndpoint(const CloudCacheClientOptions& Options)
 }
 
 std::unique_ptr<UpstreamEndpoint>
-MakeZenUpstreamEndpoint(const ZenClientOptions& Options)
+MakeZenUpstreamEndpoint(const ZenStructuredCacheClientOptions& Options)
 {
 	return std::make_unique<detail::ZenUpstreamEndpoint>(Options);
 }
diff --git a/zenserver/upstream/upstreamcache.h b/zenserver/upstream/upstreamcache.h
index c2770a930..fb2550cad 100644
--- a/zenserver/upstream/upstreamcache.h
+++ b/zenserver/upstream/upstreamcache.h
@@ -20,7 +20,7 @@ class CbObjectWriter;
 class CidStore;
 class ZenCacheStore;
 struct CloudCacheClientOptions;
-struct ZenClientOptions;
+struct ZenStructuredCacheClientOptions;
 
 struct UpstreamCacheRecord
 {
@@ -175,6 +175,6 @@ std::unique_ptr<UpstreamCache> MakeUpstreamCache(const UpstreamCacheOptions& Opt
 
 std::unique_ptr<UpstreamEndpoint> MakeJupiterUpstreamEndpoint(const CloudCacheClientOptions& Options);
 
-std::unique_ptr<UpstreamEndpoint> MakeZenUpstreamEndpoint(const ZenClientOptions& Options);
+std::unique_ptr<UpstreamEndpoint> MakeZenUpstreamEndpoint(const ZenStructuredCacheClientOptions& Options);
 
 }  // namespace zen
diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp
index 3e5a42c22..cd7f48334 100644
--- a/zenserver/upstream/zen.cpp
+++ b/zenserver/upstream/zen.cpp
@@ -311,17 +311,17 @@ namespace detail {
 		ZenCacheSessionState(ZenStructuredCacheClient& Client) : OwnerClient(Client) {}
 		~ZenCacheSessionState() {}
 
-		void Reset() {}
-
-		cpr::Session& GetSession()
+		void Reset(std::chrono::milliseconds ConnectTimeout, std::chrono::milliseconds Timeout)
 		{
-			OwnerClient.InitializeSessionState(*this);
-			return Session;
+			Session.SetBody({});
+			Session.SetHeader({});
+			Session.SetConnectTimeout(ConnectTimeout);
+			Session.SetTimeout(Timeout);
 		}
 
-	private:
-		friend class ZenStructuredCacheClient;
+		cpr::Session& GetSession() { return Session; }
 
+	private:
 		ZenStructuredCacheClient& OwnerClient;
 		cpr::Session			  Session;
 	};
@@ -330,7 +330,7 @@ namespace detail {
 
 //////////////////////////////////////////////////////////////////////////
 
-ZenStructuredCacheClient::ZenStructuredCacheClient(const ZenClientOptions& Options)
+ZenStructuredCacheClient::ZenStructuredCacheClient(const ZenStructuredCacheClientOptions& Options)
 : m_Log(logging::Get(std::string_view("zenclient")))
 , m_ServiceUrl(Options.Url)
 , m_ConnectTimeout(Options.ConnectTimeout)
@@ -358,7 +358,7 @@ ZenStructuredCacheClient::AllocSessionState()
 		State = new detail::ZenCacheSessionState(*this);
 	}
 
-	State->Reset();
+	State->Reset(m_ConnectTimeout, m_Timeout);
 
 	return State;
 }
@@ -370,13 +370,6 @@ ZenStructuredCacheClient::FreeSessionState(detail::ZenCacheSessionState* State)
 	m_SessionStateCache.push_front(State);
 }
 
-void
-ZenStructuredCacheClient::InitializeSessionState(detail::ZenCacheSessionState& State)
-{
-	State.Session.SetConnectTimeout(m_ConnectTimeout);
-	State.Session.SetTimeout(m_Timeout);
-}
-
 //////////////////////////////////////////////////////////////////////////
 
 using namespace std::literals;
diff --git a/zenserver/upstream/zen.h b/zenserver/upstream/zen.h
index d3df09e06..d549c2fc4 100644
--- a/zenserver/upstream/zen.h
+++ b/zenserver/upstream/zen.h
@@ -101,7 +101,7 @@ struct ZenCacheResult
 	bool		Success = false;
 };
 
-struct ZenClientOptions
+struct ZenStructuredCacheClientOptions
 {
 	std::string_view			 Url;
 	std::span<std::string const> Urls;
@@ -144,7 +144,7 @@ private:
 class ZenStructuredCacheClient : public RefCounted
 {
 public:
-	ZenStructuredCacheClient(const ZenClientOptions& Options);
+	ZenStructuredCacheClient(const ZenStructuredCacheClientOptions& Options);
 	~ZenStructuredCacheClient();
 
 	std::string_view ServiceUrl() const { return m_ServiceUrl; }
@@ -162,10 +162,8 @@ private:
 
 	detail::ZenCacheSessionState* AllocSessionState();
 	void						  FreeSessionState(detail::ZenCacheSessionState*);
-	void						  InitializeSessionState(detail::ZenCacheSessionState& State);
 
 	friend class ZenStructuredCacheSession;
-	friend struct detail::ZenCacheSessionState;
 };
 
 }  // namespace zen
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index ca3195616..a330fb558 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -677,23 +677,29 @@ ZenServer::InitializeStructuredCache(ZenServiceConfig& ServiceConfig)
 			zen::CloudCacheClientOptions Options;
 			if (UpstreamConfig.JupiterConfig.UseProductionSettings)
 			{
-				Options = zen::CloudCacheClientOptions{.ServiceUrl		   = "https://jupiter.devtools.epicgames.com"sv,
-													   .DdcNamespace	   = "ue.ddc"sv,
-													   .BlobStoreNamespace = "ue.ddc"sv,
-													   .OAuthProvider = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv,
-													   .OAuthClientId = "0oao91lrhqPiAlaGD0x7"sv,
-													   .OAuthSecret	  = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv,
-													   .UseLegacyDdc  = false};
+				Options =
+					zen::CloudCacheClientOptions{.ServiceUrl		 = "https://jupiter.devtools.epicgames.com"sv,
+												 .DdcNamespace		 = "ue.ddc"sv,
+												 .BlobStoreNamespace = "ue.ddc"sv,
+												 .OAuthProvider		 = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv,
+												 .OAuthClientId		 = "0oao91lrhqPiAlaGD0x7"sv,
+												 .OAuthSecret		 = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv,
+												 .ConnectTimeout	 = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds),
+												 .Timeout			 = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds),
+												 .UseLegacyDdc		 = false};
 			}
 			else if (UpstreamConfig.JupiterConfig.UseDevelopmentSettings)
 			{
-				Options = zen::CloudCacheClientOptions{.ServiceUrl		   = "https://jupiter.devtools-dev.epicgames.com"sv,
-													   .DdcNamespace	   = "ue4.ddc"sv,
-													   .BlobStoreNamespace = "test.ddc"sv,
-													   .OAuthProvider = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv,
-													   .OAuthClientId = "0oao91lrhqPiAlaGD0x7"sv,
-													   .OAuthSecret	  = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv,
-													   .UseLegacyDdc  = false};
+				Options =
+					zen::CloudCacheClientOptions{.ServiceUrl		 = "https://jupiter.devtools-dev.epicgames.com"sv,
+												 .DdcNamespace		 = "ue4.ddc"sv,
+												 .BlobStoreNamespace = "test.ddc"sv,
+												 .OAuthProvider		 = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv,
+												 .OAuthClientId		 = "0oao91lrhqPiAlaGD0x7"sv,
+												 .OAuthSecret		 = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv,
+												 .ConnectTimeout	 = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds),
+												 .Timeout			 = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds),
+												 .UseLegacyDdc		 = false};
 			}
 
 			Options.ServiceUrl		   = ValueOrDefault(UpstreamConfig.JupiterConfig.Url, Options.ServiceUrl);