Introduced dedicated HTTP testing service, used during development to exercise the server framework

1 files changed, 14 insertions, 2 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index c857d4c71..57e691ea1 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -72,6 +72,7 @@
 #include "diag/diagsvcs.h"
 #include "experimental/usnjournal.h"
 #include "projectstore.h"
+#include "testing/httptest.h"
 #include "testing/launch.h"
 #include "upstream/jupiter.h"
 #include "upstream/upstreamcache.h"
@@ -205,7 +206,7 @@ public:
 				else
 				{
 					UpstreamCache.reset();
-					spdlog::info("upstream cache NOT active");
+					spdlog::info("NOT using upstream cache");
 				}
 			}
 
@@ -221,10 +222,20 @@ public:
 		{
 			StartMesh(BasePort);
 		}
+		else
+		{
+			spdlog::info("NOT starting mesh");
+		}
 
 		m_Http.Initialize(BasePort);
 		m_Http.AddEndpoint(m_HealthService);
-		m_Http.AddEndpoint(m_TestService);
+
+		if (m_TestMode)
+		{
+			m_Http.AddEndpoint(m_TestService);
+			m_Http.AddEndpoint(m_TestingService);
+		}
+
 		m_Http.AddEndpoint(m_AdminService);
 
 		if (m_HttpProjectService)
@@ -365,6 +376,7 @@ private:
 	zen::CasGc										 m_Gc{*m_CasStore};
 	zen::CasScrubber								 m_Scrubber{*m_CasStore};
 	HttpTestService									 m_TestService;
+	zen::HttpTestingService							 m_TestingService;
 	zen::HttpCasService								 m_CasService{*m_CasStore};
 	zen::RefPtr<zen::ProjectStore>					 m_ProjectStore;
 	zen::Ref<zen::LocalProjectService>				 m_LocalProjectService;