Refactored upstream cache to better handle different states in prep for dynamic auth tokens.

1 files changed, 16 insertions, 16 deletions

diff --git a/zenserver/cache/structuredcache.h b/zenserver/cache/structuredcache.h
index 9ee7da99b..1bf3940e7 100644
--- a/zenserver/cache/structuredcache.h
+++ b/zenserver/cache/structuredcache.h
@@ -55,11 +55,11 @@ enum class CachePolicy : uint32_t;
 class HttpStructuredCacheService : public HttpService, public IHttpStatsProvider, public IHttpStatusProvider
 {
 public:
-	HttpStructuredCacheService(ZenCacheStore&				  InCacheStore,
-							   CidStore&					  InCidStore,
-							   HttpStatsService&			  StatsService,
-							   HttpStatusService&			  StatusService,
-							   std::unique_ptr<UpstreamCache> UpstreamCache);
+	HttpStructuredCacheService(ZenCacheStore&	  InCacheStore,
+							   CidStore&		  InCidStore,
+							   HttpStatsService&  StatsService,
+							   HttpStatusService& StatusService,
+							   UpstreamCache&	  UpstreamCache);
 	~HttpStructuredCacheService();
 
 	virtual const char* BaseUri() const override;
@@ -97,17 +97,17 @@ private:
 	virtual void	   HandleStatsRequest(zen::HttpServerRequest& Request) override;
 	virtual void	   HandleStatusRequest(zen::HttpServerRequest& Request) override;
 
-	spdlog::logger&				   Log() { return m_Log; }
-	spdlog::logger&				   m_Log;
-	ZenCacheStore&				   m_CacheStore;
-	HttpStatsService&			   m_StatsService;
-	HttpStatusService&			   m_StatusService;
-	CidStore&					   m_CidStore;
-	std::unique_ptr<UpstreamCache> m_UpstreamCache;
-	uint64_t					   m_LastScrubTime = 0;
-	metrics::OperationTiming	   m_HttpRequests;
-	metrics::OperationTiming	   m_UpstreamGetRequestTiming;
-	CacheStats					   m_CacheStats;
+	spdlog::logger&			 Log() { return m_Log; }
+	spdlog::logger&			 m_Log;
+	ZenCacheStore&			 m_CacheStore;
+	HttpStatsService&		 m_StatsService;
+	HttpStatusService&		 m_StatusService;
+	CidStore&				 m_CidStore;
+	UpstreamCache&			 m_UpstreamCache;
+	uint64_t				 m_LastScrubTime = 0;
+	metrics::OperationTiming m_HttpRequests;
+	metrics::OperationTiming m_UpstreamGetRequestTiming;
+	CacheStats				 m_CacheStats;
 };
 
 }  // namespace zen