Added connect/transfer timeout options for Jupiter client.

1 files changed, 23 insertions, 19 deletions

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;