Moved zenserverprocess into zenutil/zenserverprocess.h

13 files changed, 55 insertions, 9 deletions

diff --git a/zen/cmds/cache.cpp b/zen/cmds/cache.cpp
index 69e500293..202bf9246 100644
--- a/zen/cmds/cache.cpp
+++ b/zen/cmds/cache.cpp
@@ -5,7 +5,7 @@
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
 #include <zenhttp/httpcommon.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 
 #include <memory>
 
diff --git a/zen/cmds/run.cpp b/zen/cmds/run.cpp
index e5210f695..d0ecaaf2b 100644
--- a/zen/cmds/run.cpp
+++ b/zen/cmds/run.cpp
@@ -12,7 +12,7 @@
 #include <zencore/logging.h>
 #include <zencore/string.h>
 #include <zencore/timer.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 
 #include <filesystem>
 
diff --git a/zen/cmds/scrub.cpp b/zen/cmds/scrub.cpp
index a9b8505ec..fd6047078 100644
--- a/zen/cmds/scrub.cpp
+++ b/zen/cmds/scrub.cpp
@@ -1,6 +1,7 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
 #include "scrub.h"
+#include <zenutil/zenserverprocess.h>
 
 using namespace std::literals;
 
@@ -17,3 +18,21 @@ ScrubCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 
 	return 0;
 }
+
+//////////////////////////////////////////////////////////////////////////
+
+GcCommand::GcCommand()
+{
+}
+
+GcCommand::~GcCommand()
+{
+}
+
+int 
+GcCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
+{
+	ZEN_UNUSED(GlobalOptions, argc, argv);
+
+	return 0;
+}
diff --git a/zen/cmds/scrub.h b/zen/cmds/scrub.h
index 1bfb4ad6c..348f579c5 100644
--- a/zen/cmds/scrub.h
+++ b/zen/cmds/scrub.h
@@ -21,3 +21,18 @@ public:
 private:
 	cxxopts::Options m_Options{"scrub", "Scrub zen storage"};
 };
+
+/** Garbage collect storage
+ */
+class GcCommand : public ZenCmdBase
+{
+public:
+	GcCommand();
+	~GcCommand();
+
+	virtual int				  Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) override;
+	virtual cxxopts::Options* Options() override { return &m_Options; }
+
+private:
+	cxxopts::Options m_Options{"gc", "Garbage collect zen storage"};
+};
diff --git a/zen/cmds/top.cpp b/zen/cmds/top.cpp
index f519c6c03..8c74e5145 100644
--- a/zen/cmds/top.cpp
+++ b/zen/cmds/top.cpp
@@ -5,7 +5,7 @@
 #include <zencore/logging.h>
 #include <zencore/uid.h>
 #include <zencore/fmtutils.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 
 #include <memory>
 
diff --git a/zen/cmds/up.cpp b/zen/cmds/up.cpp
index a1047fd57..99fbfe3ae 100644
--- a/zen/cmds/up.cpp
+++ b/zen/cmds/up.cpp
@@ -4,7 +4,7 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 
 #include <memory>
 
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 8a634107d..6b4d39f89 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -19,7 +19,7 @@
 #include <zenhttp/httpclient.h>
 #include <zenhttp/httpshared.h>
 #include <zenhttp/zenhttp.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 
 #include <mimalloc.h>
 
diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp
index 48eda7512..4ba4835af 100644
--- a/zenserver/diag/logging.cpp
+++ b/zenserver/diag/logging.cpp
@@ -204,6 +204,12 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 		IsAsync	 = false;
 	}
 
+	if (GlobalOptions.IsTest)
+	{
+		LogLevel = spdlog::level::trace;
+		IsAsync = false;
+	}
+
 	if (IsAsync)
 	{
 		const int QueueSize	  = 8192;
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index f1960ab36..3681d2f8c 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -11,7 +11,7 @@
 #include <zencore/timer.h>
 #include <zencore/windows.h>
 #include <zenhttp/httpserver.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 #include <zenstore/cas.h>
 #include <zenstore/cidstore.h>
 
diff --git a/zenutil/include/zenserverprocess.h b/zenutil/include/zenutil/zenserverprocess.h
index d1897d5e2..d1897d5e2 100644
--- a/zenutil/include/zenserverprocess.h
+++ b/zenutil/include/zenutil/zenserverprocess.h
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 2f2b3bd33..622423cac 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "zenserverprocess.h"
+#include "zenutil/zenserverprocess.h"
 
 #include <zencore/except.h>
 #include <zencore/filesystem.h>
diff --git a/zenutil/zenutil.vcxproj b/zenutil/zenutil.vcxproj
index fcb27dff3..3bf6111f7 100644
--- a/zenutil/zenutil.vcxproj
+++ b/zenutil/zenutil.vcxproj
@@ -100,13 +100,16 @@
     <ClCompile Include="zenserverprocess.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\zenserverprocess.h" />
+    <ClInclude Include="include\zenutil\zenserverprocess.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\zencore\zencore.vcxproj">
       <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="xmake.lua" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/zenutil/zenutil.vcxproj.filters b/zenutil/zenutil.vcxproj.filters
index ca1414842..9952e7159 100644
--- a/zenutil/zenutil.vcxproj.filters
+++ b/zenutil/zenutil.vcxproj.filters
@@ -4,6 +4,9 @@
     <ClCompile Include="zenserverprocess.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\zenserverprocess.h" />
+    <ClInclude Include="include\zenutil\zenserverprocess.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="xmake.lua" />
   </ItemGroup>
 </Project>
\ No newline at end of file