aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake.lua2
-rw-r--r--zencore/include/zencore/trace.h1
-rw-r--r--zencore/trace.cpp11
-rw-r--r--zenserver/zenserver.cpp4
4 files changed, 16 insertions, 2 deletions
diff --git a/xmake.lua b/xmake.lua
index c5cee1bec..be01b9fb6 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -130,7 +130,7 @@ option_end()
add_define_by_config("ZEN_ENABLE_MESH", "zenmesh")
option("zentrace")
- set_default(false)
+ set_default(true)
set_showmenu(true)
set_description("Enable UE's Trace support")
option_end()
diff --git a/zencore/include/zencore/trace.h b/zencore/include/zencore/trace.h
index f28fdeeaf..0af490f23 100644
--- a/zencore/include/zencore/trace.h
+++ b/zencore/include/zencore/trace.h
@@ -22,6 +22,7 @@ enum class TraceType
{
File,
Network,
+ None
};
void TraceInit(const char* HostOrPath, TraceType Type);
diff --git a/zencore/trace.cpp b/zencore/trace.cpp
index 6a35571e6..788dcec07 100644
--- a/zencore/trace.cpp
+++ b/zencore/trace.cpp
@@ -12,6 +12,8 @@
void
TraceInit(const char* HostOrPath, TraceType Type)
{
+ bool EnableEvents = true;
+
switch (Type)
{
case TraceType::Network:
@@ -21,6 +23,10 @@ TraceInit(const char* HostOrPath, TraceType Type)
case TraceType::File:
trace::WriteTo(HostOrPath);
break;
+
+ case TraceType::None:
+ EnableEvents = false;
+ break;
}
trace::FInitializeDesc Desc = {
@@ -28,7 +34,10 @@ TraceInit(const char* HostOrPath, TraceType Type)
};
trace::Initialize(Desc);
- trace::ToggleChannel("cpu", true);
+ if (EnableEvents)
+ {
+ trace::ToggleChannel("cpu", true);
+ }
}
#endif // ZEN_WITH_TRACE
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 6a42a4044..feb73c5f7 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -1035,6 +1035,10 @@ main(int argc, char* argv[])
{
TraceInit(ServerOptions.TraceFile.c_str(), TraceType::File);
}
+ else
+ {
+ TraceInit(nullptr, TraceType::None);
+ }
#endif // ZEN_WITH_TRACE
#if ZEN_PLATFORM_WINDOWS