diff options
| author | Per Larsson <[email protected]> | 2022-02-02 19:08:10 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-02-02 19:08:10 +0100 |
| commit | 10ab6d8c768b54dfcd085ec94aa959dc9d1103ce (patch) | |
| tree | c48a96d8a1ea8d4267906af76e72e1e95f70fc78 /zenserver/zenserver.cpp | |
| parent | Changed OIDC token endpoint. (diff) | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-10ab6d8c768b54dfcd085ec94aa959dc9d1103ce.tar.xz zen-10ab6d8c768b54dfcd085ec94aa959dc9d1103ce.zip | |
Merged main.
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index c8ee024fb..6b178ee0c 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -555,7 +555,7 @@ private: std::unique_ptr<zen::HttpStructuredCacheService> m_StructuredCacheService; zen::HttpAdminService m_AdminService{m_GcScheduler}; zen::HttpHealthService m_HealthService; - zen::Mesh m_ZenMesh{m_IoContext}; + zen::MeshTracker m_ZenMesh{m_IoContext}; #if ZEN_WITH_COMPUTE_SERVICES std::unique_ptr<zen::HttpLaunchService> m_HttpLaunchService; std::unique_ptr<zen::HttpFunctionService> m_HttpFunctionService; @@ -1018,6 +1018,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 |