From d3c8d678d395c9ce091d93e629d77d698f714dcd Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Mon, 20 Sep 2021 08:54:09 +0200
Subject: Probe upstream Zen server when initializing upstream cache.

---
 zenserver/upstream/upstreamcache.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'zenserver/upstream/upstreamcache.cpp')

diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index c015ef3e9..e235db516 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -292,8 +292,20 @@ namespace detail {
 
 		virtual bool Initialize() override
 		{
-			// TODO: Test and authenticate Zen client connection
-			return !m_Client->ServiceUrl().empty();
+			try
+			{
+				ZenStructuredCacheSession Session(*m_Client);
+				ZenCacheResult			  Result;
+				for (int32_t Attempt = 0, MaxAttempts = 3; Attempt < MaxAttempts && !Result.Success; ++Attempt)
+				{
+					Result = Session.SayHello();
+				}
+				return Result.Success;
+			}
+			catch (std::exception&)
+			{
+				return false;
+			}
 		}
 
 		virtual std::string_view DisplayName() const override { return m_DisplayName; }
-- 
cgit v1.2.3