zenserver API changes, some other minor changes (#720)

* add system metrics output  to top command
* removed unnecessary xmake directives
* file system API/comment tweaks
* fixed out-of-range access in httpserver test
* updated ZenServer base API to allow customization by mode

2 files changed, 16 insertions, 2 deletions

diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp
index 559695a94..b2cae6482 100644
--- a/src/zenserver/storage/zenstorageserver.cpp
+++ b/src/zenserver/storage/zenstorageserver.cpp
@@ -17,6 +17,7 @@
 #include <zencore/sentryintegration.h>
 #include <zencore/session.h>
 #include <zencore/string.h>
+#include <zencore/system.h>
 #include <zencore/thread.h>
 #include <zencore/timer.h>
 #include <zencore/trace.h>
@@ -676,8 +677,8 @@ ZenStorageServer::Run()
 			"        \\/   \\/     \\/          \\/                         \\/ \n");
 
 		ExtendableStringBuilder<256> BuildOptions;
-		GetBuildOptions(BuildOptions);
-		ZEN_INFO("Build options: {}", BuildOptions);
+		GetBuildOptions(BuildOptions, '\n');
+		ZEN_INFO("Build options ({}/{}):\n{}", GetOperatingSystemName(), GetCpuName(), BuildOptions);
 	}
 
 	ZEN_INFO(ZEN_APP_NAME " now running (pid: {})", GetCurrentProcessId());
@@ -897,6 +898,16 @@ ZenStorageServerMain::ZenStorageServerMain(ZenStorageServerConfig& ServerOptions
 {
 }
 
+ZenStorageServerMain::~ZenStorageServerMain()
+{
+}
+
+void
+ZenStorageServerMain::InitializeLogging()
+{
+	InitializeServerLogging(m_ServerOptions, /* WithCacheService */ true);
+}
+
 void
 ZenStorageServerMain::DoRun(ZenServerState::ZenServerEntry* Entry)
 {
diff --git a/src/zenserver/storage/zenstorageserver.h b/src/zenserver/storage/zenstorageserver.h
index f79c55bc8..5ccb587d6 100644
--- a/src/zenserver/storage/zenstorageserver.h
+++ b/src/zenserver/storage/zenstorageserver.h
@@ -103,7 +103,10 @@ class ZenStorageServerMain : public ZenServerMain
 {
 public:
 	ZenStorageServerMain(ZenStorageServerConfig& ServerOptions);
+	~ZenStorageServerMain();
+
 	virtual void DoRun(ZenServerState::ZenServerEntry* Entry) override;
+	virtual void InitializeLogging() override;
 
 	ZenStorageServerMain(const ZenStorageServerMain&) = delete;
 	ZenStorageServerMain& operator=(const ZenStorageServerMain&) = delete;