aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2023-08-21 10:05:20 +0200
committerGitHub <[email protected]>2023-08-21 10:05:20 +0200
commit6d2f5c0cbc5f835f13617e542f121326865dd1ea (patch)
tree30100b7d2034ee2af19168c2fdab70f2027b995b /src
parentMerge pull request #364 from EpicGames/zs/mac-linux-rlimit-stdout (diff)
downloadzen-6d2f5c0cbc5f835f13617e542f121326865dd1ea.tar.xz
zen-6d2f5c0cbc5f835f13617e542f121326865dd1ea.zip
fix trace close (#365)
* Make sure we close our trace session properly
Diffstat (limited to 'src')
-rw-r--r--src/zencore/include/zencore/trace.h1
-rw-r--r--src/zencore/trace.cpp6
-rw-r--r--src/zenserver/zenserver.cpp1
3 files changed, 8 insertions, 0 deletions
diff --git a/src/zencore/include/zencore/trace.h b/src/zencore/include/zencore/trace.h
index 0af490f23..3bc2f7f02 100644
--- a/src/zencore/include/zencore/trace.h
+++ b/src/zencore/include/zencore/trace.h
@@ -26,6 +26,7 @@ enum class TraceType
};
void TraceInit(const char* HostOrPath, TraceType Type);
+void TraceShutdown();
#else
diff --git a/src/zencore/trace.cpp b/src/zencore/trace.cpp
index 3aace1972..6da5d28d6 100644
--- a/src/zencore/trace.cpp
+++ b/src/zencore/trace.cpp
@@ -48,4 +48,10 @@ TraceInit(const char* HostOrPath, TraceType Type)
}
}
+void
+TraceShutdown()
+{
+ trace::Shutdown();
+}
+
#endif // ZEN_WITH_TRACE
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index d4a82231d..016cf1328 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -1430,6 +1430,7 @@ main(int argc, char* argv[])
{
TraceInit(nullptr, TraceType::None);
}
+ auto _ = MakeGuard([]() { TraceShutdown(); });
#endif // ZEN_WITH_TRACE
#if ZEN_PLATFORM_WINDOWS