From f45fb6c13407e98434db255b36e3cff402387588 Mon Sep 17 00:00:00 2001 From: Per Larsson Date: Wed, 17 Nov 2021 12:21:28 +0100 Subject: Added connect/transfer timeout options for Jupiter client. --- zenserver/upstream/upstreamcache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zenserver/upstream/upstreamcache.cpp') 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 -MakeZenUpstreamEndpoint(const ZenClientOptions& Options) +MakeZenUpstreamEndpoint(const ZenStructuredCacheClientOptions& Options) { return std::make_unique(Options); } -- cgit v1.2.3 From 200913d1b0d9716e73bf465b7b42802cc7b508cc Mon Sep 17 00:00:00 2001 From: Per Larsson Date: Wed, 17 Nov 2021 12:35:34 +0100 Subject: Check both success and error code when initializing Jupiter upstream. --- zenserver/upstream/upstreamcache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zenserver/upstream/upstreamcache.cpp') diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index 0290723f0..0fa497faf 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -58,7 +58,7 @@ namespace detail { CloudCacheSession Session(m_Client); const CloudCacheResult Result = Session.Authenticate(); - m_HealthOk = Result.ErrorCode == 0; + m_HealthOk = Result.Success && Result.ErrorCode == 0; return {.Reason = std::move(Result.Reason), .Ok = Result.Success}; } -- cgit v1.2.3