diff options
| author | Dan Engelbrecht <[email protected]> | 2023-08-21 10:05:20 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-21 10:05:20 +0200 |
| commit | 6d2f5c0cbc5f835f13617e542f121326865dd1ea (patch) | |
| tree | 30100b7d2034ee2af19168c2fdab70f2027b995b | |
| parent | Merge pull request #364 from EpicGames/zs/mac-linux-rlimit-stdout (diff) | |
| download | zen-6d2f5c0cbc5f835f13617e542f121326865dd1ea.tar.xz zen-6d2f5c0cbc5f835f13617e542f121326865dd1ea.zip | |
fix trace close (#365)
* Make sure we close our trace session properly
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/zencore/include/zencore/trace.h | 1 | ||||
| -rw-r--r-- | src/zencore/trace.cpp | 6 | ||||
| -rw-r--r-- | src/zenserver/zenserver.cpp | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a0faae55..f9da58fed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - `--oplog` Oplog name (id) - Bugfix: Make sure to check oplog op attachments when gathering references for GC - Bugfix: Reduce log level of RLIMIT message on Mac/Linux to avoid it interfering with parsing of stdout from `zen version` command +- Bugfix: Make sure we close our trace session properly at exit when trace is enabled - Improvement: Add endpoint in project store to update the information in a project without deleting the stored data/oplog - Improvement: Add endpoint in project store to update the information in a project without deleting the stored data/oplog - Improvement: Add oplog op content to error result if attachment is missing when doing `oplog-export` 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 |