diff options
| author | Stefan Boberg <[email protected]> | 2023-01-26 14:03:51 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2023-01-26 14:03:51 +0100 |
| commit | 2155332d14ad7d517e590f6f8cd90585d22f09ab (patch) | |
| tree | 1e154a043ec1f42ed8c2a5116a7c5da2dac6541d | |
| parent | merge (diff) | |
| download | zen-2155332d14ad7d517e590f6f8cd90585d22f09ab.tar.xz zen-2155332d14ad7d517e590f6f8cd90585d22f09ab.zip | |
removed some more mesh related debris
| -rw-r--r-- | upstream-config-templates/zen_config.lua.j2 | 1 | ||||
| -rw-r--r-- | zenutil/include/zenutil/zenserverprocess.h | 2 | ||||
| -rw-r--r-- | zenutil/zenserverprocess.cpp | 5 |
3 files changed, 0 insertions, 8 deletions
diff --git a/upstream-config-templates/zen_config.lua.j2 b/upstream-config-templates/zen_config.lua.j2 index 2fe7a18c7..bec43e31a 100644 --- a/upstream-config-templates/zen_config.lua.j2 +++ b/upstream-config-templates/zen_config.lua.j2 @@ -9,7 +9,6 @@ server = { network = {
httpserverclass = "httpsys", -- httpsys|asio
port = 1337,
- meshenabled = false
}
gc = {
diff --git a/zenutil/include/zenutil/zenserverprocess.h b/zenutil/include/zenutil/zenserverprocess.h index 2a3146e2d..cdaf7bd89 100644 --- a/zenutil/include/zenutil/zenserverprocess.h +++ b/zenutil/include/zenutil/zenserverprocess.h @@ -47,7 +47,6 @@ struct ZenServerInstance void WaitUntilReady(); [[nodiscard]] bool WaitUntilReady(int Timeout); void EnableTermination() { m_Terminate = true; } - void EnableMesh() { m_MeshEnabled = true; } void Detach(); inline int GetPid() { return m_Process.Pid(); } inline void SetOwnerPid(int Pid) { m_OwnerPid = Pid; } @@ -71,7 +70,6 @@ private: NamedEvent m_ShutdownEvent; bool m_Terminate = false; std::filesystem::path m_TestDir; - bool m_MeshEnabled = false; int m_BasePort = 0; std::optional<int> m_OwnerPid; diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index ae347dd53..3d9324af9 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -528,11 +528,6 @@ ZenServerInstance::SpawnServer(int BasePort, std::string_view AdditionalServerAr PathToUtf8(m_TestDir.c_str(), CommandLine); } - if (m_MeshEnabled) - { - CommandLine << " --mesh"; - } - if (!AdditionalServerArgs.empty()) { CommandLine << " " << AdditionalServerArgs; |