diff options
| author | Martin Ridgers <[email protected]> | 2021-11-17 13:51:15 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-17 13:51:15 +0100 |
| commit | b4c04c87a8d5bf9d61b8ca5dbd2f4bb3e9fe20b1 (patch) | |
| tree | 8cf0e4b589d2d0b16cfebb12f9cba8dba19fafee /zenserver/upstream/upstreamcache.cpp | |
| parent | Submitted some debug printing in error (diff) | |
| parent | Check both success and error code when initializing Jupiter upstream. (diff) | |
| download | zen-b4c04c87a8d5bf9d61b8ca5dbd2f4bb3e9fe20b1.tar.xz zen-b4c04c87a8d5bf9d61b8ca5dbd2f4bb3e9fe20b1.zip | |
Merged main
Diffstat (limited to 'zenserver/upstream/upstreamcache.cpp')
| -rw-r--r-- | zenserver/upstream/upstreamcache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index dec61ad65..53b3710bf 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}; } @@ -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); } |