restructured zenserver configuration (#575)

this breaks out the configuration logic to allow multiple applications to share common configuration and initialization logic whilst customizing chosen aspects of the process

2 files changed, 10 insertions, 10 deletions

diff --git a/src/zenserver/storage/admin/admin.cpp b/src/zenserver/storage/admin/admin.cpp
index 4803063d7..68b91825d 100644
--- a/src/zenserver/storage/admin/admin.cpp
+++ b/src/zenserver/storage/admin/admin.cpp
@@ -102,7 +102,7 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 								   ZenCacheStore*		   CacheStore,
 								   std::function<void()>&& FlushFunction,
 								   const LogPaths&		   LogPaths,
-								   const ZenServerOptions& ServerOptions)
+								   const ZenServerConfig&  ServerOptions)
 : m_GcScheduler(Scheduler)
 , m_BackgroundJobQueue(BackgroundJobQueue)
 , m_CacheStore(CacheStore)
diff --git a/src/zenserver/storage/admin/admin.h b/src/zenserver/storage/admin/admin.h
index 9a49f5120..ee3da4579 100644
--- a/src/zenserver/storage/admin/admin.h
+++ b/src/zenserver/storage/admin/admin.h
@@ -11,7 +11,7 @@ namespace zen {
 class GcScheduler;
 class JobQueue;
 class ZenCacheStore;
-struct ZenServerOptions;
+struct ZenServerConfig;
 
 class HttpAdminService : public zen::HttpService
 {
@@ -27,20 +27,20 @@ public:
 					 ZenCacheStore*			 CacheStore,
 					 std::function<void()>&& FlushFunction,
 					 const LogPaths&		 LogPaths,
-					 const ZenServerOptions& ServerOptions);
+					 const ZenServerConfig&	 ServerOptions);
 	~HttpAdminService();
 
 	virtual const char* BaseUri() const override;
 	virtual void		HandleRequest(zen::HttpServerRequest& Request) override;
 
 private:
-	HttpRequestRouter		m_Router;
-	GcScheduler&			m_GcScheduler;
-	JobQueue&				m_BackgroundJobQueue;
-	ZenCacheStore*			m_CacheStore;
-	std::function<void()>	m_FlushFunction;
-	LogPaths				m_LogPaths;
-	const ZenServerOptions& m_ServerOptions;
+	HttpRequestRouter	   m_Router;
+	GcScheduler&		   m_GcScheduler;
+	JobQueue&			   m_BackgroundJobQueue;
+	ZenCacheStore*		   m_CacheStore;
+	std::function<void()>  m_FlushFunction;
+	LogPaths			   m_LogPaths;
+	const ZenServerConfig& m_ServerOptions;
 };
 
 }  // namespace zen