Merged main

1 files changed, 15 insertions, 3 deletions

diff --git a/zenserver/upstream/zen.h b/zenserver/upstream/zen.h
index 1fbfed7dd..ac3abc931 100644
--- a/zenserver/upstream/zen.h
+++ b/zenserver/upstream/zen.h
@@ -101,6 +101,14 @@ struct ZenCacheResult
 	bool		Success = false;
 };
 
+struct ZenClientOptions
+{
+	std::string_view			 Url;
+	std::span<std::string const> Urls;
+	std::chrono::milliseconds	 ConnectTimeout{};
+	std::chrono::milliseconds	 Timeout{};
+};
+
 /** Zen Structured Cache session
  *
  * This provides a context in which cache queries can be performed
@@ -136,7 +144,7 @@ private:
 class ZenStructuredCacheClient : public RefCounted
 {
 public:
-	ZenStructuredCacheClient(std::string_view ServiceUrl);
+	ZenStructuredCacheClient(const ZenClientOptions& Options);
 	~ZenStructuredCacheClient();
 
 	std::string_view ServiceUrl() const { return m_ServiceUrl; }
@@ -144,16 +152,20 @@ public:
 	inline spdlog::logger& Log() { return m_Log; }
 
 private:
-	spdlog::logger& m_Log;
-	std::string		m_ServiceUrl;
+	spdlog::logger&			  m_Log;
+	std::string				  m_ServiceUrl;
+	std::chrono::milliseconds m_ConnectTimeout;
+	std::chrono::milliseconds m_Timeout;
 
 	RwLock									 m_SessionStateLock;
 	std::list<detail::ZenCacheSessionState*> m_SessionStateCache;
 
 	detail::ZenCacheSessionState* AllocSessionState();
 	void						  FreeSessionState(detail::ZenCacheSessionState*);
+	void						  InitializeSessionState(detail::ZenCacheSessionState& State);
 
 	friend class ZenStructuredCacheSession;
+	friend struct detail::ZenCacheSessionState;
 };
 
 }  // namespace zen