clean up trace options parsing (#473)

* clean up trace command line options
explicitly shut down worker pools
* some additional startup trace scopes

1 files changed, 12 insertions, 24 deletions

diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 6d9a478be..553562473 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -393,6 +393,18 @@ main(int argc, char* argv[])
 	try
 	{
 		ZenServerOptions ServerOptions;
+
+		{
+#if ZEN_WITH_TRACE
+			TraceInit("zenserver");
+			ServerOptions.HasTraceCommandlineOptions = GetTraceOptionsFromCommandline(ServerOptions.TraceOptions);
+			if (ServerOptions.HasTraceCommandlineOptions)
+			{
+				TraceConfigure(ServerOptions.TraceOptions);
+			}
+#endif	// ZEN_WITH_TRACE
+		}
+
 		ParseCliOptions(argc, argv, ServerOptions);
 
 		if (ServerOptions.Detach)
@@ -435,30 +447,6 @@ main(int argc, char* argv[])
 			CopyTree(ServerOptions.BaseSnapshotDir, ServerOptions.DataDir, {.EnableClone = true});
 		}
 
-#if ZEN_WITH_TRACE
-		if (ServerOptions.TraceHost.size())
-		{
-			TraceStart("zenserver", ServerOptions.TraceHost.c_str(), TraceType::Network);
-		}
-		else if (ServerOptions.TraceFile.size())
-		{
-			TraceStart("zenserver", ServerOptions.TraceFile.c_str(), TraceType::File);
-		}
-		else
-		{
-			TraceInit("zenserver");
-		}
-#endif	// ZEN_WITH_TRACE
-
-#if ZEN_WITH_MEMTRACK
-		FMalloc* TraceMalloc = MemoryTrace_Create(GMalloc);
-		if (TraceMalloc != GMalloc)
-		{
-			GMalloc = TraceMalloc;
-			MemoryTrace_Initialize();
-		}
-#endif
-
 		ZEN_MEMSCOPE(GetZenserverTag());
 
 #if ZEN_PLATFORM_WINDOWS